-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 06/21/2011 06:34 PM, Eric Anholt wrote: > --- > 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);
Should this also get moved? I guess I'm not sure what these two functions do, so this may be a spurious comment. > - _swsetup_InvalidateState(ctx, new_state); > _vbo_InvalidateState(ctx, new_state); > > intel->NewGLState |= new_state; -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk4CLYkACgkQX1gOwKyEAw+XfwCeOhS/nmOZPhtXcpR6jDiiZ55q Xg0AniKKUb1T2ljv9dd+PE7P+BJp7k0X =DOW0 -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev