Mesa (master): Revert "mesa: only update _MaxElement when we actually need it"

Marek Olšák mareko at kemper.freedesktop.org
Thu Apr 19 11:53:57 PDT 2012


Module: Mesa
Branch: master
Commit: bf3304a84b60a25bbc9de14d11af6e423939d7c3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf3304a84b60a25bbc9de14d11af6e423939d7c3

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Apr 19 20:47:22 2012 +0200

Revert "mesa: only update _MaxElement when we actually need it"

This reverts commit 0de5a21470b3bff9b7c8714e5d960d5ed9d01b9c.

I was wrong, we use it in the vbo module too.
This fixes a performance regression in Nexuiz.

---

 src/mesa/main/state.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 6efc45a..f82e4a2 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -562,10 +562,8 @@ _mesa_update_state_locked( struct gl_context *ctx )
       new_prog_state |= update_program( ctx );
    }
 
-   if (ctx->Const.CheckArrayBounds &&
-       (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT))) {
+   if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT))
       _mesa_update_array_object_max_element(ctx, ctx->Array.ArrayObj);
-   }
 
  out:
    new_prog_state |= update_program_constants(ctx);



More information about the mesa-commit mailing list