fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-19 06:40:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: more solid is_buffer_referenced implementation

Browse source 
This fixes crash from 7a1b5c937f,
and also removes the unused "map" pointer.
This commit is contained in:
Marek Olšák 2010-04-18 17:19:45 +02:00
parent cea7b9f937
commit 24ceef7a69
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/r300/r300_render.c
View file

@ -152,9 +152,9 @@ static boolean immd_is_good_idea(struct r300_context *r300,
if (!checked[vbi]) {
vbuf = &r300->vertex_buffer[vbi];
if (r300->rws->is_buffer_referenced(r300->rws,
r300_buffer(vbuf->buffer)->buf,
R300_REF_CS | R300_REF_HW)) {
if (r300_buffer_is_referenced(&r300->context,
vbuf->buffer,
R300_REF_CS | R300_REF_HW)) {
/* It's a very bad idea to map it... */
return FALSE;
}

18
src/gallium/drivers/r300/r300_screen_buffer.c
View file

@ -34,9 +34,9 @@
#include "r300_screen_buffer.h"
#include "r300_winsys.h"
static unsigned r300_buffer_is_referenced(struct pipe_context *context,
struct pipe_resource *buf,
unsigned face, unsigned level)
unsigned r300_buffer_is_referenced(struct pipe_context *context,
struct pipe_resource *buf,
enum r300_reference_domain domain)
{
struct r300_context *r300 = r300_context(context);
struct r300_buffer *rbuf = r300_buffer(buf);
@ -44,12 +44,19 @@ static unsigned r300_buffer_is_referenced(struct pipe_context *context,
if (r300_buffer_is_user_buffer(buf))
return PIPE_UNREFERENCED;
if (r300->rws->is_buffer_referenced(r300->rws, rbuf->buf, R300_REF_CS))
if (r300->rws->is_buffer_referenced(r300->rws, rbuf->buf, domain))
return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
return PIPE_UNREFERENCED;
}
static unsigned r300_buffer_is_referenced_by_cs(struct pipe_context *context,
struct pipe_resource *buf,
unsigned face, unsigned level)
{
return r300_buffer_is_referenced(context, buf, R300_REF_CS);
}
/* External helper, not required to implent u_resource_vtbl:
*/
int r300_upload_index_buffer(struct r300_context *r300,
@ -174,7 +181,6 @@ r300_buffer_transfer_map( struct pipe_context *pipe,
rws->buffer_reference(rws, &rbuf->buf, NULL);
rbuf->num_ranges = 0;
rbuf->map = NULL;
rbuf->buf = r300_winsys_buffer_create(r300screen,
16,
rbuf->b.b.bind, /* XXX */
@ -243,7 +249,7 @@ struct u_resource_vtbl r300_buffer_vtbl =
{
u_default_resource_get_handle, /* get_handle */
r300_buffer_destroy, /* resource_destroy */
r300_buffer_is_referenced, /* is_buffer_referenced */
r300_buffer_is_referenced_by_cs, /* is_buffer_referenced */
u_default_get_transfer, /* get_transfer */
u_default_transfer_destroy, /* transfer_destroy */
r300_buffer_transfer_map, /* transfer_map */

6
src/gallium/drivers/r300/r300_screen_buffer.h
View file

@ -55,8 +55,6 @@ struct r300_buffer
void *user_buffer;
struct r300_buffer_range ranges[R300_BUFFER_MAX_RANGES];
unsigned num_ranges;
void *map;
};
/* Functions. */
@ -77,6 +75,10 @@ struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen,
unsigned bytes,
unsigned usage);
unsigned r300_buffer_is_referenced(struct pipe_context *context,
struct pipe_resource *buf,
enum r300_reference_domain domain);
/* Inline functions. */
static INLINE struct r300_buffer *r300_buffer(struct pipe_resource *buffer)