fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: Stop doing special _NEW_STENCIL state flagging on drawbuffers.

Browse source 
2/3 packets depending on Stencil._Enabled already checked for
_NEW_BUFFERS, so just add _NEW_BUFFERS to the remaining one.

Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2013-06-20 09:08:30 -07:00
parent 3faccc42ad
commit 94ecf913b4
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_cc.c
View file

@ -104,7 +104,7 @@ static void upload_cc_unit(struct brw_context *brw)
sizeof(*cc), 64, &brw->cc.state_offset);
memset(cc, 0, sizeof(*cc));
/* _NEW_STENCIL */
/* _NEW_STENCIL | _NEW_BUFFERS */
if (ctx->Stencil._Enabled) {
const unsigned back = ctx->Stencil._BackFace;
@ -230,7 +230,7 @@ static void upload_cc_unit(struct brw_context *brw)
const struct brw_tracked_state brw_cc_unit = {
.dirty = {
.mesa = _NEW_STENCIL | _NEW_COLOR | _NEW_DEPTH,
.mesa = _NEW_STENCIL | _NEW_COLOR | _NEW_DEPTH | _NEW_BUFFERS,
.brw = BRW_NEW_BATCH | BRW_NEW_STATS_WM,
.cache = CACHE_NEW_CC_VP
},

7
src/mesa/drivers/dri/i965/brw_vtbl.c
View file

@ -130,12 +130,7 @@ brw_update_draw_buffer(struct intel_context *intel)
return;
}
/* Mesa's Stencil._Enabled field is updated when
* _NEW_BUFFERS | _NEW_STENCIL, but i965 code assumes that the value
* only changes with _NEW_STENCIL (which seems sensible). So flag it
* here since this is the _NEW_BUFFERS path.
*/
intel->NewGLState |= (_NEW_DEPTH | _NEW_STENCIL);
intel->NewGLState |= _NEW_DEPTH;
/* The driver uses this in places that need to look up
* renderbuffers' buffer objects.

2
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -379,7 +379,7 @@ static void brw_wm_populate_key( struct brw_context *brw,
if (ctx->Depth.Test && ctx->Depth.Mask) /* ?? */
lookup |= IZ_DEPTH_WRITE_ENABLE_BIT;
/* _NEW_STENCIL */
/* _NEW_STENCIL | _NEW_BUFFERS */
if (ctx->Stencil._Enabled) {
lookup |= IZ_STENCIL_TEST_ENABLE_BIT;

2
src/mesa/drivers/dri/i965/gen6_depthstencil.c
View file

@ -47,7 +47,7 @@ gen6_upload_depth_stencil_state(struct brw_context *brw)
&brw->cc.depth_stencil_state_offset);
memset(ds, 0, sizeof(*ds));
/* _NEW_STENCIL */
/* _NEW_STENCIL | _NEW_BUFFERS */
if (ctx->Stencil._Enabled) {
int back = ctx->Stencil._BackFace;