Mesa (mesa_7_7_branch): svga: Ensure buffer size/alignment is not zero.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Jan 19 04:34:54 UTC 2010
Module: Mesa
Branch: mesa_7_7_branch
Commit: dc298559c6c838d8ad744e07c134a1c8846c9b33
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc298559c6c838d8ad744e07c134a1c8846c9b33
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Jan 14 15:06:48 2010 +0000
svga: Ensure buffer size/alignment is not zero.
---
src/gallium/drivers/svga/svga_screen_buffer.c | 3 +++
src/gallium/drivers/svga/svga_swtnl_backend.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/svga/svga_screen_buffer.c b/src/gallium/drivers/svga/svga_screen_buffer.c
index 1f8a889..c014f2e 100644
--- a/src/gallium/drivers/svga/svga_screen_buffer.c
+++ b/src/gallium/drivers/svga/svga_screen_buffer.c
@@ -594,6 +594,9 @@ svga_buffer_create(struct pipe_screen *screen,
struct svga_screen *ss = svga_screen(screen);
struct svga_buffer *sbuf;
+ assert(size);
+ assert(alignment);
+
sbuf = CALLOC_STRUCT(svga_buffer);
if(!sbuf)
goto error1;
diff --git a/src/gallium/drivers/svga/svga_swtnl_backend.c b/src/gallium/drivers/svga/svga_swtnl_backend.c
index b4f757a..3d82e4f 100644
--- a/src/gallium/drivers/svga/svga_swtnl_backend.c
+++ b/src/gallium/drivers/svga/svga_swtnl_backend.c
@@ -87,13 +87,13 @@ svga_vbuf_render_allocate_vertices( struct vbuf_render *render,
if (!svga_render->vbuf) {
svga_render->vbuf_size = MAX2(size, svga_render->vbuf_alloc_size);
svga_render->vbuf = pipe_buffer_create(screen,
- 0,
+ 16,
PIPE_BUFFER_USAGE_VERTEX,
svga_render->vbuf_size);
if(!svga_render->vbuf) {
svga_context_flush(svga, NULL);
svga_render->vbuf = pipe_buffer_create(screen,
- 0,
+ 16,
PIPE_BUFFER_USAGE_VERTEX,
svga_render->vbuf_size);
assert(svga_render->vbuf);
@@ -259,7 +259,7 @@ svga_vbuf_render_draw( struct vbuf_render *render,
if (!svga_render->ibuf) {
svga_render->ibuf_size = MAX2(size, svga_render->ibuf_alloc_size);
svga_render->ibuf = pipe_buffer_create(screen,
- 0,
+ 2,
PIPE_BUFFER_USAGE_VERTEX,
svga_render->ibuf_size);
svga_render->ibuf_offset = 0;
More information about the mesa-commit
mailing list