diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-17 08:07:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-17 08:07:33 +0200 |
| commit | 856fbbaf1e53303d8307bfae1761f1ba96871f1e (patch) | |
| tree | e029665439ddbccfb253271a5f5290d72c2b2168 /mesalib/src/mesa/main/texcompress.c | |
| parent | f15a40afaf6d1b3a4841d25631f947da1b289f89 (diff) | |
| parent | ded57b5a4131a213d57f5a20d50b819b7a8924df (diff) | |
| download | vcxsrv-856fbbaf1e53303d8307bfae1761f1ba96871f1e.tar.gz vcxsrv-856fbbaf1e53303d8307bfae1761f1ba96871f1e.tar.bz2 vcxsrv-856fbbaf1e53303d8307bfae1761f1ba96871f1e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman mesa git update 17 oct 2012
Diffstat (limited to 'mesalib/src/mesa/main/texcompress.c')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c index bb61e6eda..957cc6df6 100644 --- a/mesalib/src/mesa/main/texcompress.c +++ b/mesalib/src/mesa/main/texcompress.c @@ -275,7 +275,6 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats) } } -#if FEATURE_ES1 if (ctx->API == API_OPENGLES) { if (formats) { formats[n++] = GL_PALETTE4_RGB8_OES; @@ -293,7 +292,6 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats) n += 10; } } -#endif return n; } |