diff options
author | Marek Olšák <[email protected]> | 2010-05-26 04:18:27 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2010-05-26 04:47:26 +0200 |
commit | 5c067a63040cc66f0320f30482529a4ff1bd3811 (patch) | |
tree | 0dc371d1dc23ad42a8f5c361acfabd388afbad41 /src/gallium | |
parent | f2582da3bb72b06d7a751537898f752e110857c7 (diff) |
r300/compiler: move hardware caps to the radeon_compiler base struct
Needed for vertex shaders too.
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/r300/r300_fs.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_vs.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c index b2d3b5243c9..a434808046c 100644 --- a/src/gallium/drivers/r300/r300_fs.c +++ b/src/gallium/drivers/r300/r300_fs.c @@ -251,8 +251,8 @@ static void r300_translate_fragment_shader( compiler.code = &shader->code; compiler.state = shader->compare_state; - compiler.is_r500 = r300->screen->caps.is_r500; - compiler.max_temp_regs = compiler.is_r500 ? 128 : 32; + compiler.Base.is_r500 = r300->screen->caps.is_r500; + compiler.Base.max_temp_regs = compiler.Base.is_r500 ? 128 : 32; compiler.AllocateHwInputs = &allocate_hardware_inputs; compiler.UserData = &shader->inputs; diff --git a/src/gallium/drivers/r300/r300_vs.c b/src/gallium/drivers/r300/r300_vs.c index 6d69bb3de3e..b25c786d6b3 100644 --- a/src/gallium/drivers/r300/r300_vs.c +++ b/src/gallium/drivers/r300/r300_vs.c @@ -203,6 +203,8 @@ void r300_translate_vertex_shader(struct r300_context *r300, compiler.Base.Debug = DBG_ON(r300, DBG_VP); compiler.code = &vs->code; compiler.UserData = vs; + compiler.Base.is_r500 = r300->screen->caps.is_r500; + compiler.Base.max_temp_regs = 32; if (compiler.Base.Debug) { debug_printf("r300: Initial vertex program\n"); |