projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel: Add a new "common" library for more code sharing
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
test_vec4_register_coalesce.cpp
diff --git
a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
index d84e2e98ec0cdbd209a5a56a3d82668f61354bb4..944c7386c069bf14e76f87a1fb98a7efc5b1d91f 100644
(file)
--- a/
src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
+++ b/
src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
@@
-24,6
+24,7
@@
#include <gtest/gtest.h>
#include "brw_vec4.h"
#include "brw_vs.h"
#include <gtest/gtest.h>
#include "brw_vec4.h"
#include "brw_vs.h"
+#include "program/program.h"
using namespace brw;
using namespace brw;
@@
-39,7
+40,7
@@
public:
struct brw_device_info *devinfo;
struct gl_context *ctx;
struct gl_shader_program *shader_prog;
struct brw_device_info *devinfo;
struct gl_context *ctx;
struct gl_shader_program *shader_prog;
- struct brw_v
ertex_program *vp
;
+ struct brw_v
ue_prog_data *prog_data
;
vec4_visitor *v;
};
vec4_visitor *v;
};
@@
-48,15
+49,16
@@
class register_coalesce_vec4_visitor : public vec4_visitor
{
public:
register_coalesce_vec4_visitor(struct brw_compiler *compiler,
{
public:
register_coalesce_vec4_visitor(struct brw_compiler *compiler,
- nir_shader *shader)
- : vec4_visitor(compiler, NULL, NULL, NULL, shader, NULL,
+ nir_shader *shader,
+ struct brw_vue_prog_data *prog_data)
+ : vec4_visitor(compiler, NULL, NULL, prog_data, shader, NULL,
false /* no_spills */, -1)
{
false /* no_spills */, -1)
{
+ prog_data->dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT;
}
protected:
}
protected:
- virtual dst_reg *make_reg_for_system_value(int location,
- const glsl_type *type)
+ virtual dst_reg *make_reg_for_system_value(int location)
{
unreachable("Not reached");
}
{
unreachable("Not reached");
}
@@
-93,15
+95,12
@@
void register_coalesce_test::SetUp()
ctx = (struct gl_context *)calloc(1, sizeof(*ctx));
compiler = (struct brw_compiler *)calloc(1, sizeof(*compiler));
devinfo = (struct brw_device_info *)calloc(1, sizeof(*devinfo));
ctx = (struct gl_context *)calloc(1, sizeof(*ctx));
compiler = (struct brw_compiler *)calloc(1, sizeof(*compiler));
devinfo = (struct brw_device_info *)calloc(1, sizeof(*devinfo));
+ prog_data = (struct brw_vue_prog_data *)calloc(1, sizeof(*prog_data));
compiler->devinfo = devinfo;
compiler->devinfo = devinfo;
- vp = ralloc(NULL, struct brw_vertex_program);
-
nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_VERTEX, NULL);
nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_VERTEX, NULL);
- v = new register_coalesce_vec4_visitor(compiler, shader);
-
- _mesa_init_gl_program(&vp->program.Base, GL_VERTEX_SHADER, 0);
+ v = new register_coalesce_vec4_visitor(compiler, shader, prog_data);
devinfo->gen = 4;
}
devinfo->gen = 4;
}
@@
-135,7
+134,7
@@
TEST_F(register_coalesce_test, test_compute_to_mrf)
m0.writemask = WRITEMASK_X;
m0.type = BRW_REGISTER_TYPE_F;
m0.writemask = WRITEMASK_X;
m0.type = BRW_REGISTER_TYPE_F;
- vec4_instruction *mul = v->emit(v->MUL(temp, something,
src_reg
(1.0f)));
+ vec4_instruction *mul = v->emit(v->MUL(temp, something,
brw_imm_f
(1.0f)));
v->emit(v->MOV(m0, src_reg(temp)));
register_coalesce(v);
v->emit(v->MOV(m0, src_reg(temp)));
register_coalesce(v);
@@
-159,7
+158,7
@@
TEST_F(register_coalesce_test, test_multiple_use)
m1.type = BRW_REGISTER_TYPE_F;
src_reg src = src_reg(temp);
m1.type = BRW_REGISTER_TYPE_F;
src_reg src = src_reg(temp);
- vec4_instruction *mul = v->emit(v->MUL(temp, something,
src_reg
(1.0f)));
+ vec4_instruction *mul = v->emit(v->MUL(temp, something,
brw_imm_f
(1.0f)));
src.swizzle = BRW_SWIZZLE_XXXX;
v->emit(v->MOV(m0, src));
src.swizzle = BRW_SWIZZLE_XYZW;
src.swizzle = BRW_SWIZZLE_XXXX;
v->emit(v->MOV(m0, src));
src.swizzle = BRW_SWIZZLE_XYZW;