OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc4: Use proper type sizes for uniforms.

Browse Source
This commit is contained in:
Eric Anholt
2016-07-27 15:03:39 -07:00
parent bdb54cdc16
commit f4d143f0d9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/vc4/vc4_program.c
View File

@@ -37,6 +37,7 @@
#include "vc4_context.h" #include "vc4_context.h"
#include "vc4_qpu.h" #include "vc4_qpu.h"
#include "vc4_qir.h" #include "vc4_qir.h"
#include "mesa/state_tracker/st_glsl_types.h"
#ifdef USE_VC4_SIMULATOR #ifdef USE_VC4_SIMULATOR
#include "simpenrose/simpenrose.h" #include "simpenrose/simpenrose.h"
#endif #endif
@@ -1486,11 +1487,11 @@ static void
ntq_setup_uniforms(struct vc4_compile *c) ntq_setup_uniforms(struct vc4_compile *c)
{ {
nir_foreach_variable(var, &c->s->uniforms) { nir_foreach_variable(var, &c->s->uniforms) {
unsigned array_len = MAX2(glsl_get_length(var->type), 1); uint32_t vec4_count = st_glsl_type_size(var->type);
unsigned array_elem_size = 4 * sizeof(float); unsigned vec4_size = 4 * sizeof(float);
declare_uniform_range(c, var->data.driver_location * array_elem_size, declare_uniform_range(c, var->data.driver_location * vec4_size,
array_len * array_elem_size); vec4_count * vec4_size);
} }
} }