KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/gen6/gs: Enable texture units and upload sampler state. 

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Iago Toral Quiroga 2014-07-30 09:08:48 +02:00
parent 6669fd0818
commit 66ec61c49f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_context.c
View File

@ -325,7 +325,7 @@ brw_initialize_context_constants(struct brw_context *brw)
MIN2(ctx->Const.MaxTextureCoordUnits,
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits);
ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits = max_samplers;
if (brw->gen >= 7)
if (brw->gen >= 6)
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits = max_samplers;
else
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits = 0;

1
src/mesa/drivers/dri/i965/brw_state_upload.c
View File

@ -147,6 +147,7 @@ static const struct brw_tracked_state *gen6_atoms[] =
&brw_fs_samplers,
&brw_vs_samplers,
&brw_gs_samplers,
&gen6_sampler_state,
&gen6_multisample_state,

2
src/mesa/drivers/dri/i965/gen6_sampler_state.c
View File

@ -40,7 +40,7 @@ upload_sampler_state_pointers(struct brw_context *brw)
PS_SAMPLER_STATE_CHANGE |
(4 - 2));
OUT_BATCH(brw->vs.base.sampler_offset); /* VS */
OUT_BATCH(0); /* GS */
OUT_BATCH(brw->gs.base.sampler_offset); /* GS */
OUT_BATCH(brw->wm.base.sampler_offset);
ADVANCE_BATCH();
}