diff options
author | Marek Olšák <maraeo@gmail.com> | 2010-04-05 18:52:55 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2010-04-05 19:21:09 +0200 |
commit | a1f85cf689b6f9ccf6b7310485460f84c8d78cad (patch) | |
tree | f294e10528b0b40ed6c7f151c567804c4d7c3bc9 /src/gallium/drivers/r300/r300_state_derived.c | |
parent | df65e64c294e93d83f6400b29a2a2d1c69db2c5d (diff) |
r300g: typecast using the r300_texture function
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_derived.c')
-rw-r--r-- | src/gallium/drivers/r300/r300_state_derived.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index 292b20a7f4..b9d3718f1c 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -470,7 +470,7 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) state->tx_enable |= 1 << i; view = state->fragment_sampler_views[i]; - tex = (struct r300_texture *)view->texture; + tex = r300_texture(view->texture); sampler = state->sampler_states[i]; assert(view->format == tex->tex.format); |