X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Ftests%2Fset_uniform_initializer_tests.cpp;h=d3fdeb3a844e2386fe36b12f11d8534e4a32fd70;hb=a398168f7238b42c2fbecf940e09fc5ebef71f62;hp=be202b3d57ece7c53336be47742691f257c4dd6b;hpb=665b8d7b6d8eae03c9dc0ef1a744fe59d9cc6cb6;p=mesa.git diff --git a/src/glsl/tests/set_uniform_initializer_tests.cpp b/src/glsl/tests/set_uniform_initializer_tests.cpp index be202b3d57e..d3fdeb3a844 100644 --- a/src/glsl/tests/set_uniform_initializer_tests.cpp +++ b/src/glsl/tests/set_uniform_initializer_tests.cpp @@ -24,14 +24,14 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" +#include "util/ralloc.h" #include "uniform_initializer_utils.h" namespace linker { extern void set_uniform_initializer(void *mem_ctx, gl_shader_program *prog, const char *name, const glsl_type *type, - ir_constant *val); + ir_constant *val, unsigned int boolean_true); } class set_uniform_initializer : public ::testing::Test { @@ -179,11 +179,11 @@ non_array_test(void *mem_ctx, struct gl_shader_program *prog, ir_constant *val; generate_data(mem_ctx, base_type, columns, rows, val); - linker::set_uniform_initializer(mem_ctx, prog, name, type, val); + linker::set_uniform_initializer(mem_ctx, prog, name, type, val, 0xF00F); verify_initialization(prog, actual_index); verify_data(prog->UniformStorage[actual_index].storage, 0, val, - red_zone_components); + red_zone_components, 0xF00F); } TEST_F(set_uniform_initializer, int_uniform) @@ -335,11 +335,12 @@ array_test(void *mem_ctx, struct gl_shader_program *prog, generate_array_data(mem_ctx, base_type, columns, rows, array_size + excess_data_size, val); - linker::set_uniform_initializer(mem_ctx, prog, name, element_type, val); + linker::set_uniform_initializer(mem_ctx, prog, name, element_type, val, + 0xF00F); verify_initialization(prog, actual_index); verify_data(prog->UniformStorage[actual_index].storage, array_size, - val, red_zone_components); + val, red_zone_components, 0xF00F); } TEST_F(set_uniform_initializer, int_array_uniform)