nouveau: nv30: Use same workaround as i915 for segfault related to vbo
This commit is contained in:
@@ -10,7 +10,7 @@ nv30_flush(struct pipe_context *pipe, unsigned flags,
|
||||
struct pipe_fence_handle **fence)
|
||||
{
|
||||
struct nv30_context *nv30 = nv30_context(pipe);
|
||||
|
||||
|
||||
if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
|
||||
BEGIN_RING(rankine, 0x1fd8, 1);
|
||||
OUT_RING (2);
|
||||
@@ -37,10 +37,14 @@ nv30_is_texture_referenced( struct pipe_context *pipe,
|
||||
unsigned face, unsigned level)
|
||||
{
|
||||
/**
|
||||
* FIXME: Optimize.
|
||||
* FIXME: Return the corrent result. We can't alays return referenced
|
||||
* since it causes a double flush within the vbo module.
|
||||
*/
|
||||
|
||||
#if 0
|
||||
return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
@@ -48,10 +52,14 @@ nv30_is_buffer_referenced( struct pipe_context *pipe,
|
||||
struct pipe_buffer *buf)
|
||||
{
|
||||
/**
|
||||
* FIXME: Optimize.
|
||||
* FIXME: Return the corrent result. We can't alays return referenced
|
||||
* since it causes a double flush within the vbo module.
|
||||
*/
|
||||
|
||||
#if 0
|
||||
return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
struct pipe_context *
|
||||
@@ -95,4 +103,3 @@ nv30_create(struct pipe_screen *pscreen, unsigned pctx_id)
|
||||
|
||||
return &nv30->pipe;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user