summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2007-12-13 21:00:10 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2007-12-13 21:00:10 +0000
commit7a2d3ac5bcad87d139f97eaa9ca2aa90d174240a (patch)
tree1c283eec2a2f78a45b7e05b0696ad3db84c5cee7
parent568fcf64c774f5f8e9f65bb86c121f5d550b1632 (diff)
965: get brw_wm_surface_state compiling again
-rw-r--r--src/mesa/pipe/i965simple/brw_state.c3
-rw-r--r--src/mesa/pipe/i965simple/brw_wm_surface_state.c11
2 files changed, 11 insertions, 3 deletions
diff --git a/src/mesa/pipe/i965simple/brw_state.c b/src/mesa/pipe/i965simple/brw_state.c
index 032a4e0285..26450ae597 100644
--- a/src/mesa/pipe/i965simple/brw_state.c
+++ b/src/mesa/pipe/i965simple/brw_state.c
@@ -203,6 +203,9 @@ static void * brw_create_fs_state(struct pipe_context *pipe,
brw_shader_info(shader->tokens,
&brw_fp->info);
+ tgsi_dump(shader->tokens, 0);
+
+
return (void *)brw_fp;
}
diff --git a/src/mesa/pipe/i965simple/brw_wm_surface_state.c b/src/mesa/pipe/i965simple/brw_wm_surface_state.c
index 2901e28adb..6e68c4c660 100644
--- a/src/mesa/pipe/i965simple/brw_wm_surface_state.c
+++ b/src/mesa/pipe/i965simple/brw_wm_surface_state.c
@@ -189,6 +189,9 @@ static void upload_wm_surfaces(struct brw_context *brw )
{
struct brw_surface_state surf;
+
+ /* BRW_NEW_FRAMEBUFFER
+ */
struct pipe_surface *region = brw->attribs.FrameBuffer.cbufs[0];/*fixme*/
memset(&surf, 0, sizeof(surf));
@@ -213,7 +216,7 @@ static void upload_wm_surfaces(struct brw_context *brw )
surf.ss0.surface_type = BRW_SURFACE_NULL;
}
- /* _NEW_COLOR */
+ /* BRW_NEW_BLEND */
surf.ss0.color_blend = (!brw->attribs.Blend->logicop_enable &&
brw->attribs.Blend->blend_enable);
@@ -235,7 +238,7 @@ static void upload_wm_surfaces(struct brw_context *brw )
for (i = 0; i < BRW_MAX_TEX_UNIT; i++) {
const struct brw_texture *texUnit = brw->attribs.Texture[i];
- /* _NEW_TEXTURE, BRW_NEW_TEXDATA
+ /* BRW_NEW_TEXTURE
*/
if (texUnit->base.refcount/*(texUnit->refcount > 0) == really used */) {
@@ -299,7 +302,9 @@ static void emit_reloc_wm_surfaces(struct brw_context *brw)
const struct brw_tracked_state brw_wm_surfaces = {
.dirty = {
- .brw = BRW_NEW_CONTEXT,
+ .brw = (BRW_NEW_FRAMEBUFFER |
+ BRW_NEW_BLEND |
+ BRW_NEW_TEXTURE),
.cache = 0
},
.update = upload_wm_surfaces,