fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 20:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: Texrect factor cleanup.

Browse source 
(0, 0, 0, 1) is a much saner default value, and texrect factors only need
to be (1/s, 1/t, 0, 1).
This commit is contained in:
Corbin Simpson 2009-11-20 14:55:22 -08:00
parent f4041b37e2
commit 6a95996abb
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/drivers/r300/r300_emit.c
View file

@ -129,7 +129,7 @@ static const float * get_shader_constant(
struct rc_constant * constant,
struct r300_constant_buffer * externals)
{
static float vec[4] = { 0.0, 0.0, 0.0, 0.0 };
static float vec[4] = { 0.0, 0.0, 0.0, 1.0 };
struct pipe_texture *tex;
switch(constant->Type) {
@ -140,26 +140,30 @@ static const float * get_shader_constant(
return constant->u.Immediate;
case RC_CONSTANT_STATE:
switch (constant->u.State[0])
{
/* R3xx-specific */
switch (constant->u.State[0]) {
/* Factor for converting rectangle coords to
* normalized coords. Should only show up on non-r500. */
case RC_STATE_R300_TEXRECT_FACTOR:
tex = &r300->textures[constant->u.State[1]]->tex;
vec[0] = 1.0 / tex->width[0];
vec[1] = 1.0 / tex->height[0];
vec[2] = vec[3] = 1;
break;
default:
assert(0);
debug_printf("r300: Implementation error: "
"Unknown RC_CONSTANT type %d\n", constant->u.State[0]);
}
return vec;
break;
default:
debug_printf("r300: Implementation error: Unhandled constant type %i\n",
constant->Type);
return vec;
debug_printf("r300: Implementation error: "
"Unhandled constant type %d\n", constant->Type);
}
/* This should either be (0, 0, 0, 1), which should be a relatively safe
* RGBA or STRQ value, or it could be one of the RC_CONSTANT_STATE
* state factors. */
return vec;
}
/* Convert a normal single-precision float into the 7.16 format