Mesa (master): i965: Don' t bother telling swrast_setup about state updates until fallback.
Eric Anholt
anholt at kemper.freedesktop.org
Fri Jun 24 17:49:49 UTC 2011
Module: Mesa
Branch: master
Commit: 3541cc0d40f86d8ea63a876b7215831335ec677d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3541cc0d40f86d8ea63a876b7215831335ec677d
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jun 21 17:02:14 2011 -0700
i965: Don't bother telling swrast_setup about state updates until fallback.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/drivers/dri/i915/i830_vtbl.c | 2 ++
src/mesa/drivers/dri/i915/i915_vtbl.c | 2 ++
src/mesa/drivers/dri/intel/intel_context.c | 1 -
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index 16c7aca..584df82 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -34,6 +34,7 @@
#include "tnl/tnl.h"
#include "tnl/t_context.h"
#include "tnl/t_vertex.h"
+#include "swrast_setup/swrast_setup.h"
#define FILE_DEBUG_FLAG DEBUG_STATE
@@ -718,6 +719,7 @@ i830_invalidate_state(struct intel_context *intel, GLuint new_state)
{
struct gl_context *ctx = &intel->ctx;
+ _swsetup_InvalidateState(ctx, new_state);
_tnl_InvalidateState(ctx, new_state);
_tnl_invalidate_vertex_state(ctx, new_state);
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 6383cda..9721a1c 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -36,6 +36,7 @@
#include "tnl/tnl.h"
#include "tnl/t_context.h"
#include "tnl/t_vertex.h"
+#include "swrast_setup/swrast_setup.h"
#include "intel_batchbuffer.h"
#include "intel_regions.h"
@@ -709,6 +710,7 @@ i915_invalidate_state(struct intel_context *intel, GLuint new_state)
{
struct gl_context *ctx = &intel->ctx;
+ _swsetup_InvalidateState(ctx, new_state);
_tnl_InvalidateState(ctx, new_state);
_tnl_invalidate_vertex_state(ctx, new_state);
}
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 8b95444..70aee52 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -504,7 +504,6 @@ intelInvalidateState(struct gl_context * ctx, GLuint new_state)
struct intel_context *intel = intel_context(ctx);
_swrast_InvalidateState(ctx, new_state);
- _swsetup_InvalidateState(ctx, new_state);
_vbo_InvalidateState(ctx, new_state);
intel->NewGLState |= new_state;
More information about the mesa-commit
mailing list