aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-09 08:56:06 +0200
committermarha <marha@users.sourceforge.net>2012-10-09 08:56:06 +0200
commite957ce706e896f5ed802d81f26a2663578f8153f (patch)
tree862fdd3b107b8c1bea4b84d80e60ffb41c30217d /mesalib/src
parent6b15e563fb2212808ecff29bb72e0e941425b067 (diff)
parentc48e25635aaafefec0c7761d5310f7d2071fc50c (diff)
downloadvcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.gz
vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.bz2
vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
Diffstat (limited to 'mesalib/src')
-rw-r--r--mesalib/src/mesa/main/teximage.c11
-rw-r--r--mesalib/src/mesa/program/prog_instruction.h2
-rw-r--r--mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c1
3 files changed, 4 insertions, 10 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 225081578..d7156e670 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1949,9 +1949,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
{
const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
GLint expectedSize;
- GLenum choose_format;
- GLenum choose_type;
- GLenum proxy_format;
GLenum error = GL_NO_ERROR;
char *reason = ""; /* no error */
@@ -2015,10 +2012,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
#endif
default:
- choose_format = GL_NONE;
- choose_type = GL_NONE;
- proxy_format = internalFormat;
-
/* check level */
if (level < 0 || level >= maxLevels) {
reason = "level";
@@ -3405,8 +3398,8 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
break;
default:
targetOK = GL_FALSE;
- }
- }
+ }
+ }
else {
assert(dims == 1 || dims == 3);
/* no 1D or 3D compressed textures at this time */
diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h
index 09659ce9c..656556dd4 100644
--- a/mesalib/src/mesa/program/prog_instruction.h
+++ b/mesalib/src/mesa/program/prog_instruction.h
@@ -210,7 +210,7 @@ typedef enum prog_opcode {
OPCODE_RCC, /* 1.1 */
OPCODE_RCP, /* X X X X X */
OPCODE_RET, /* 2 2 opt */
- OPCODE_RFL, /* X X */
+ OPCODE_RFL, /* X */
OPCODE_RSQ, /* X X X X X */
OPCODE_SCS, /* X X */
OPCODE_SEQ, /* 2 X X */
diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 5f056b9b1..c614bdec5 100644
--- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1172,6 +1172,7 @@ st_translate_mesa_program(
struct pipe_screen *pscreen = st->pipe->screen;
assert(procType == TGSI_PROCESSOR_VERTEX);
assert(pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_INTEGERS));
+ (void) pscreen; /* silence non-debug build warnings */
if (!ctx->Const.NativeIntegers) {
struct ureg_dst temp = ureg_DECL_local_temporary(t->ureg);
ureg_U2F( t->ureg, ureg_writemask(temp, TGSI_WRITEMASK_X), t->systemValues[i]);