diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-18 07:55:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-18 07:55:12 +0000 |
| commit | 32a666fa1f26defd3b4e508b75f1acf6e2900a40 (patch) | |
| tree | 9735440d047c660e4966060a3020e2cae419d77c /mesalib/src/mesa/main | |
| parent | ab5c2d2c78273ccdc7c9734bcba482a33fcf9652 (diff) | |
| parent | 35484135119fcf55fe1cbb1fcdd0e035f581fcfb (diff) | |
| download | vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.gz vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.bz2 vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.zip | |
merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/dlist.c | 22 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 10 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texrender.c | 7 |
3 files changed, 17 insertions, 22 deletions
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index 64ef98509..b9c29cb84 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -5351,7 +5351,7 @@ save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value) }
#endif
-static void
+static void GLAPIENTRY
save_Attr1fNV(GLenum attr, GLfloat x)
{
GET_CURRENT_CONTEXT(ctx);
@@ -5372,7 +5372,7 @@ save_Attr1fNV(GLenum attr, GLfloat x) }
}
-static void
+static void GLAPIENTRY
save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)
{
GET_CURRENT_CONTEXT(ctx);
@@ -5394,7 +5394,7 @@ save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y) }
}
-static void
+static void GLAPIENTRY
save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
{
GET_CURRENT_CONTEXT(ctx);
@@ -5417,7 +5417,7 @@ save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z) }
}
-static void
+static void GLAPIENTRY
save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
GET_CURRENT_CONTEXT(ctx);
@@ -5442,7 +5442,7 @@ save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w) }
-static void
+static void GLAPIENTRY
save_Attr1fARB(GLenum attr, GLfloat x)
{
GET_CURRENT_CONTEXT(ctx);
@@ -5463,7 +5463,7 @@ save_Attr1fARB(GLenum attr, GLfloat x) }
}
-static void
+static void GLAPIENTRY
save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)
{
GET_CURRENT_CONTEXT(ctx);
@@ -5485,7 +5485,7 @@ save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y) }
}
-static void
+static void GLAPIENTRY
save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
{
GET_CURRENT_CONTEXT(ctx);
@@ -5508,7 +5508,7 @@ save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z) }
}
-static void
+static void GLAPIENTRY
save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
GET_CURRENT_CONTEXT(ctx);
@@ -7040,7 +7040,7 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params) /* GL_ARB_instanced_arrays */
-static void
+static void GLAPIENTRY
save_VertexAttribDivisor(GLuint index, GLuint divisor)
{
GET_CURRENT_CONTEXT(ctx);
@@ -7058,7 +7058,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor) /* GL_NV_texture_barrier */
-static void
+static void GLAPIENTRY
save_TextureBarrierNV(void)
{
GET_CURRENT_CONTEXT(ctx);
@@ -7071,7 +7071,7 @@ save_TextureBarrierNV(void) /* GL_ARB_sampler_objects */
-static void
+static void GLAPIENTRY
save_BindSampler(GLuint unit, GLuint sampler)
{
Node *n;
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 68a141d29..5e54bbdf3 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -418,18 +418,16 @@ _mesa_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb) case GL_RG:
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;
return;
- case GL_RGB:
+
+ default:
switch (rb->Format) {
+ /* XXX This list is likely incomplete. */
case MESA_FORMAT_RGB9_E5_FLOAT:
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;
return;
default:;
+ /* render buffer format is supported by software rendering */
}
- break;
-
- default:
- /* render buffer format is supported by software rendering */
- ;
}
}
}
diff --git a/mesalib/src/mesa/main/texrender.c b/mesalib/src/mesa/main/texrender.c index 4bcef9899..2766bd6c5 100644 --- a/mesalib/src/mesa/main/texrender.c +++ b/mesalib/src/mesa/main/texrender.c @@ -530,7 +530,6 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att) {
struct texture_renderbuffer *trb
= (struct texture_renderbuffer *) att->Renderbuffer;
- GLuint unused;
(void) ctx;
ASSERT(trb);
@@ -603,10 +602,8 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att) trb->Base._BaseFormat = GL_RGBA;
break;
default:
- _mesa_format_to_type_and_comps(trb->TexImage->TexFormat,
- &trb->Base.DataType, &unused);
- trb->Base._BaseFormat =
- _mesa_base_fbo_format(ctx, trb->TexImage->InternalFormat);
+ trb->Base.DataType = CHAN_TYPE;
+ trb->Base._BaseFormat = GL_RGBA;
}
trb->Base.Data = trb->TexImage->Data;
}
|