Mesa (master): r600g/compute: Don' t initialize vertex_buffer_state masks to 0x2

Tom Stellard tstellar at kemper.freedesktop.org
Thu Aug 21 14:07:22 UTC 2014


Module: Mesa
Branch: master
Commit: bf7a60f41d897be4d9804ba7c46633e38501ffe7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf7a60f41d897be4d9804ba7c46633e38501ffe7

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Tue Aug 19 16:27:38 2014 -0700

r600g/compute: Don't initialize vertex_buffer_state masks to 0x2

cs_vertex_buffer_state.enabled_mask and
cs_vertex_buffer_state.dirty_mask are both updated when
r600_set_constant_buffer() is called, so we don't need to manually
update these values.

This fixes a crash with OpenCL programs that have a kernel with no
arguments.

https://bugs.freedesktop.org/show_bug.cgi?id=82671

CC: "10.2" <mesa-stable at lists.freedesktop.org>

---

 src/gallium/drivers/r600/evergreen_compute.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 9e3404f..38b78c7 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -892,9 +892,6 @@ void evergreen_init_compute_state_functions(struct r600_context *ctx)
 	ctx->b.b.set_global_binding = evergreen_set_global_binding;
 	ctx->b.b.launch_grid = evergreen_launch_grid;
 
-	/* We always use at least one vertex buffer for parameters (id = 1)*/
-	ctx->cs_vertex_buffer_state.enabled_mask =
-	ctx->cs_vertex_buffer_state.dirty_mask = 0x2;
 }
 
 struct pipe_resource *r600_compute_global_buffer_create(




More information about the mesa-commit mailing list