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

r300-gallium: Fix bad cast. Space accounting completely works now.

Browse Source 
Boy, is my face red. :C
This commit is contained in:
Corbin Simpson
2009-05-08 22:05:18 -07:00
parent 1b26c2bbae
commit ce758a21b9
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_emit.c
+2 -2
View File
@@ -458,7 +458,7 @@ void r300_emit_dirty_state(struct r300_context* r300)
/* XXX check size */
/* Color buffers... */
for (i = 0; i < r300->framebuffer_state.nr_cbufs; i++) {
tex = (struct r300_texture*)r300->framebuffer_state.cbufs[i];
tex = (struct r300_texture*)r300->framebuffer_state.cbufs[i]->texture;
assert(tex && tex->buffer && "cbuf is marked, but NULL!");
if (!tex->buffer) return;
r300->winsys->add_buffer(r300->winsys, tex->buffer,
@@ -466,7 +466,7 @@ void r300_emit_dirty_state(struct r300_context* r300)
}
/* ...depth buffer... */
if (r300->framebuffer_state.zsbuf) {
tex = (struct r300_texture*)r300->framebuffer_state.zsbuf;
tex = (struct r300_texture*)r300->framebuffer_state.zsbuf->texture;
assert(tex && tex->buffer && "zsbuf is marked, but NULL!");
if (!tex->buffer) return;
r300->winsys->add_buffer(r300->winsys, tex->buffer,
src/gallium/drivers/r300/r300_texture.c
-3
View File
@@ -86,8 +86,6 @@ static struct pipe_texture*
r300_texture_create(struct pipe_screen* screen,
const struct pipe_texture* template)
{
/* XXX struct r300_screen* r300screen = r300_screen(screen); */
struct r300_texture* tex = CALLOC_STRUCT(r300_texture);
if (!tex) {
@@ -187,7 +185,6 @@ static struct pipe_texture*
tex->stride);
pipe_buffer_reference(&tex->buffer, buffer);
debug_printf("%p is the buffer\n", tex->buffer);
return (struct pipe_texture*)tex;
}