diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:40:24 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:40:24 +0100 |
| commit | b748a9f574361273df6b05c06c647ac4fd9b3e41 (patch) | |
| tree | 0ca1854cb84b5ae3d5d541873f2f937beb4ddd58 /src/gallium | |
| parent | c95cbd45c657ac47e908a4d99d118737034bde43 (diff) | |
| download | external_mesa3d-b748a9f574361273df6b05c06c647ac4fd9b3e41.zip external_mesa3d-b748a9f574361273df6b05c06c647ac4fd9b3e41.tar.gz external_mesa3d-b748a9f574361273df6b05c06c647ac4fd9b3e41.tar.bz2 | |
r300g,llvmpipe: fix some more merge problems
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_texture.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_emit.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index 0a0f31f..65d62fd 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -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; } diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index e6ab8e4..98a3939 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -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: |