On 10/08/2012 05:46 PM, Ian Romanick wrote:
On 10/08/2012 04:46 PM, Brian Paul wrote:
None of the returned values were used (and the vars weren't even
declared!). Fixes broken build when FEATURE_ES was defined.
I don't see any build failure. I always build with --enable-es1 and
--enable-es2. I see proxy_format, choose_format, and choose_type
declared at the top of the function. What build failure are you seeing?
Okay... I see what happened...
e6eaa85 removed the calls to ctx->Driver.TestProxyTexImage.
cb72ec5 removed some of the places that set choose_format, choose_type,
and proxy_format. It also removed the declarations.
Could you update the commit message to capture some of that history?
With that, the series is:
Reviewed-by: Ian Romanick <[email protected]>
If only we had removed all the FEATURE_* crap...
---
src/mesa/main/teximage.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index d7156e6..6c8bb85 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1977,10 +1977,6 @@ compressed_texture_error_check(struct
gl_context *ctx, GLint dimensions,
case GL_PALETTE8_R5_G6_B5_OES:
case GL_PALETTE8_RGBA4_OES:
case GL_PALETTE8_RGB5_A1_OES:
- _mesa_cpal_compressed_format_type(internalFormat, &choose_format,
- &choose_type);
- proxy_format = choose_format;
-
/* check level (note that level should be zero or less!) */
if (level > 0 || level < -maxLevels) {
reason = "level";
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
