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

i965: Define BRW_MAX_UBO 

Instead of using hard-coded values.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Iago Toral Quiroga 2015-09-30 09:55:00 +02:00
parent 4caa10193f
commit 440f9348c1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,7 +326,7 @@ brw_initialize_context_constants(struct brw_context *brw)
ctx->Const.MaxUniformBlockSize = 65536;
for (int i = 0; i < MESA_SHADER_STAGES; i++) {
struct gl_program_constants *prog = &ctx->Const.Program[i];
prog->MaxUniformBlocks = 12;
prog->MaxUniformBlocks = BRW_MAX_UBO;
prog->MaxCombinedUniformComponents =
prog->MaxUniformComponents +
ctx->Const.MaxUniformBlockSize / 4 * prog->MaxUniformBlocks;
@ -346,7 +346,7 @@ brw_initialize_context_constants(struct brw_context *brw)
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits = 0;
if (_mesa_extension_override_enables.ARB_compute_shader) {
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits = BRW_MAX_TEX_UNIT;
ctx->Const.MaxUniformBufferBindings += 12;
ctx->Const.MaxUniformBufferBindings += BRW_MAX_UBO;
} else {
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits = 0;
}

5
src/mesa/drivers/dri/i965/brw_context.h
View File

@ -708,6 +708,9 @@ struct brw_vs_prog_data {
/** Max number of render targets in a shader */
#define BRW_MAX_DRAW_BUFFERS 8
/** Max number of UBOs in a shader */
#define BRW_MAX_UBO 12
/** Max number of atomic counter buffer objects in a shader */
#define BRW_MAX_ABO 16
@ -744,7 +747,7 @@ struct brw_vs_prog_data {
#define BRW_MAX_SURFACES (BRW_MAX_DRAW_BUFFERS + \
BRW_MAX_TEX_UNIT * 2 + /* normal, gather */ \
12 + /* ubo */ \
BRW_MAX_UBO + \
BRW_MAX_ABO + \
BRW_MAX_IMAGES + \
2 + /* shader time, pull constants */ \