i965: Move intel_context::NewGLState to brw_context.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Kenneth Graunke 2013-07-04 10:29:50 -07:00
parent dd54558d31
commit a9d33dbbdd
4 changed files with 5 additions and 6 deletions

View file

@ -891,6 +891,7 @@ struct brw_context
*/
bool needs_unlit_centroid_workaround;
GLuint NewGLState;
struct {
struct brw_state_flags dirty;
} state;

View file

@ -448,8 +448,8 @@ void brw_upload_state(struct brw_context *brw)
int i;
static int dirty_count = 0;
state->mesa |= brw->intel.NewGLState;
brw->intel.NewGLState = 0;
state->mesa |= brw->NewGLState;
brw->NewGLState = 0;
state->brw |= ctx->NewDriverState;
ctx->NewDriverState = 0;

View file

@ -328,13 +328,13 @@ static const struct dri_debug_control debug_control[] = {
static void
intelInvalidateState(struct gl_context * ctx, GLuint new_state)
{
struct intel_context *intel = intel_context(ctx);
struct brw_context *brw = brw_context(ctx);
if (ctx->swrast_context)
_swrast_InvalidateState(ctx, new_state);
_vbo_InvalidateState(ctx, new_state);
intel->NewGLState |= new_state;
brw->NewGLState |= new_state;
}
void

View file

@ -113,8 +113,6 @@ struct intel_context
{
struct gl_context ctx; /**< base class, must be first field */
GLuint NewGLState;
/**
* Generation number of the hardware: 2 is 8xx, 3 is 9xx pre-965, 4 is 965.
*/