diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-10-11 17:56:51 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-10-11 17:56:51 +1000 |
| commit | f07913512c1a19dbefb1633081b7fb520af0ca2b (patch) | |
| tree | d84af76005024424193fbb8306ca32d6b6052cee | |
| parent | 94d096aa1584b1fcc7cf82c30b6e9585955ab477 (diff) | |
rebase artifcats todo reworkr600g-rats-wip
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 92370c42637..7115d8b5bf2 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -3956,7 +3956,7 @@ static void evergreen_set_shader_buffers(struct pipe_context *ctx, memset(&buf_params, 0, sizeof(buf_params)); buf_params.pipe_format = resource->b.b.format; - buf_params.last_element = resource->immed_buffer->b.b.width0 / util_format_get_blocksize(resource->b.b.format) - 1; + buf_params.size = resource->immed_buffer->b.b.width0 / util_format_get_blocksize(resource->b.b.format) - 1; buf_params.swizzle[0] = PIPE_SWIZZLE_X; buf_params.swizzle[1] = PIPE_SWIZZLE_Y; buf_params.swizzle[2] = PIPE_SWIZZLE_Z; @@ -3968,8 +3968,8 @@ static void evergreen_set_shader_buffers(struct pipe_context *ctx, memset(&buf_params, 0, sizeof(buf_params)); buf_params.pipe_format = resource->b.b.format; - buf_params.last_element = buf->buffer_offset + buf->buffer_size; - buf_params.first_element = buf->buffer_offset; + buf_params.offset = buf->buffer_offset; + buf_params.size = buf->buffer_size; buf_params.swizzle[0] = PIPE_SWIZZLE_X; buf_params.swizzle[1] = PIPE_SWIZZLE_Y; buf_params.swizzle[2] = PIPE_SWIZZLE_Z; @@ -4064,8 +4064,8 @@ static void evergreen_set_shader_images(struct pipe_context *ctx, color.view = 0; evergreen_set_color_surface_buffer(rctx, resource, iview->format, - iview->u.buf.first_element, - iview->u.buf.last_element, + iview->u.buf.offset, + iview->u.buf.size, &color); } @@ -4111,7 +4111,7 @@ static void evergreen_set_shader_images(struct pipe_context *ctx, memset(&buf_params, 0, sizeof(buf_params)); buf_params.pipe_format = iview->format; - buf_params.last_element = resource->immed_buffer->b.b.width0 / util_format_get_blocksize(iview->format) - 1; + buf_params.size = resource->immed_buffer->b.b.width0 / util_format_get_blocksize(iview->format) - 1; buf_params.swizzle[0] = PIPE_SWIZZLE_X; buf_params.swizzle[1] = PIPE_SWIZZLE_Y; buf_params.swizzle[2] = PIPE_SWIZZLE_Z; @@ -4144,8 +4144,8 @@ static void evergreen_set_shader_images(struct pipe_context *ctx, } else { memset(&buf_params, 0, sizeof(buf_params)); buf_params.pipe_format = iview->format; - buf_params.last_element = iview->u.buf.last_element; - buf_params.first_element = iview->u.buf.first_element; + buf_params.size = iview->u.buf.size; + buf_params.offset = iview->u.buf.offset; buf_params.swizzle[0] = PIPE_SWIZZLE_X; buf_params.swizzle[1] = PIPE_SWIZZLE_Y; buf_params.swizzle[2] = PIPE_SWIZZLE_Z; |