summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h1
-rw-r--r--src/mesa/drivers/dri/i965/brw_state_upload.c4
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.c4
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.h2
4 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 63775c738d4..27554cb8b66 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -891,6 +891,7 @@ struct brw_context
*/
bool needs_unlit_centroid_workaround;
+ GLuint NewGLState;
struct {
struct brw_state_flags dirty;
} state;
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index bdb2862f55f..39fe6d26564 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -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;
diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 1d6aac8d6cc..10daa58db09 100644
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -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
diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index 0ec15a73952..2894eea881d 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -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.
*/