diff options
| author | Patrice Mandin <patmandin@gmail.com> | 2009-10-17 20:27:24 +0200 |
|---|---|---|
| committer | Patrice Mandin <patmandin@gmail.com> | 2009-10-17 20:27:24 +0200 |
| commit | 67356ae04743da3137e950503ffd4a1f8fa36400 (patch) | |
| tree | 617146f7b30962e242820a0fe03d7f8650d1f103 /src/gallium/drivers/nv30 | |
| parent | 5d42e3988de8b3e1b37d8c21d18db240bc8b4096 (diff) | |
nouveau: nv30: Use same workaround as i915 for segfault related to vbo
Diffstat (limited to 'src/gallium/drivers/nv30')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_context.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c index f827bdc78b..a3e65b96f7 100644 --- a/src/gallium/drivers/nv30/nv30_context.c +++ b/src/gallium/drivers/nv30/nv30_context.c @@ -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; } - |