i965/fs: Switch from BRW_MAX_TEX_UNIT to the actual limit.
BRW_MAX_TEX_UNIT is about to grow, but only Gen7+ will be able to support the new larger value. On older platforms, we don't want to allocate the extra space - it would just be a waste. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
@@ -153,6 +153,7 @@ bool do_wm_prog(struct brw_context *brw,
|
||||
struct brw_fragment_program *fp,
|
||||
struct brw_wm_prog_key *key)
|
||||
{
|
||||
struct gl_context *ctx = &brw->ctx;
|
||||
struct brw_wm_compile *c;
|
||||
const GLuint *program;
|
||||
struct gl_shader *fs = NULL;
|
||||
@@ -174,7 +175,7 @@ bool do_wm_prog(struct brw_context *brw,
|
||||
param_count = fp->program.Base.Parameters->NumParameters * 4;
|
||||
}
|
||||
/* The backend also sometimes adds params for texture size. */
|
||||
param_count += 2 * BRW_MAX_TEX_UNIT;
|
||||
param_count += 2 * ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits;
|
||||
c->prog_data.param = rzalloc_array(NULL, const float *, param_count);
|
||||
c->prog_data.pull_param = rzalloc_array(NULL, const float *, param_count);
|
||||
|
||||
|
Reference in New Issue
Block a user