KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300g,llvmpipe: fix some more merge problems

This commit is contained in:
Roland Scheidegger 2009-11-27 17:40:24 +01:00
parent c95cbd45c6
commit b748a9f574
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/llvmpipe/lp_texture.c
View File

@ -169,7 +169,7 @@ llvmpipe_texture_blanket(struct pipe_screen * screen,
/* Only supports one type */
if (base->target != PIPE_TEXTURE_2D ||
base->last_level != 0 ||
base->depth[0] != 1) {
base->depth0 != 1) {
return NULL;
}

4
src/gallium/drivers/r300/r300_emit.c
View File

@ -145,8 +145,8 @@ static const float * get_shader_constant(
* 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[0] = 1.0 / tex->width0;
vec[1] = 1.0 / tex->height0;
break;
default: