diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-11-21 01:52:22 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-11-21 01:52:22 +0000 |
commit | 8bf75f28de161173d1cdaad8c74bcac074e1211e (patch) | |
tree | 5a9b3887c2d75612f07b43faa3cd6ed1fd0a273d /src/gallium/drivers/i965/brw_wm.h | |
parent | 95d7aca4b9963820e7ead81830340dbeb563897b (diff) | |
download | external_mesa3d-8bf75f28de161173d1cdaad8c74bcac074e1211e.zip external_mesa3d-8bf75f28de161173d1cdaad8c74bcac074e1211e.tar.gz external_mesa3d-8bf75f28de161173d1cdaad8c74bcac074e1211e.tar.bz2 |
i965g: get basic texturing working again
Revert to fixed-layout surface binding table -- it's probably the best
way to do this. Pass sampler and texture numbers separately even
though we're always keeping them the same at present.
Diffstat (limited to 'src/gallium/drivers/i965/brw_wm.h')
-rw-r--r-- | src/gallium/drivers/i965/brw_wm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/i965/brw_wm.h b/src/gallium/drivers/i965/brw_wm.h index b7d807d..f1ca9f6 100644 --- a/src/gallium/drivers/i965/brw_wm.h +++ b/src/gallium/drivers/i965/brw_wm.h @@ -135,6 +135,7 @@ struct brw_wm_instruction { GLuint opcode:8; GLuint saturate:1; GLuint writemask:4; + GLuint sampler:4; GLuint tex_unit:4; /* texture/sampler unit for texture instructions */ GLuint target:4; /* TGSI_TEXTURE_x for texture instructions, * target binding table index for FB_WRITE @@ -201,7 +202,8 @@ struct brw_fp_instruction { unsigned opcode:8; unsigned target:8; /* XXX: special usage for FB_WRITE */ unsigned tex_unit:4; - unsigned pad:12; + unsigned sampler:4; + unsigned pad:8; }; |