X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_state_constants.c;h=2c1b7048673ece9546b0699967a67cb064032178;hb=38e706656d0ea99a893dcf469e8658ca78c5ffd8;hp=8d6b46a1cae8545a98f6d69034bee2ed7eddd8d1;hpb=ee5f5e226906ff4e18f34d0e7d41aa82dcf51f70;p=mesa.git diff --git a/src/gallium/drivers/svga/svga_state_constants.c b/src/gallium/drivers/svga/svga_state_constants.c index 8d6b46a1cae..2c1b7048673 100644 --- a/src/gallium/drivers/svga/svga_state_constants.c +++ b/src/gallium/drivers/svga/svga_state_constants.c @@ -63,7 +63,7 @@ * \return number of float[4] constants put into the 'dest' buffer */ static unsigned -svga_get_extra_constants_common(struct svga_context *svga, +svga_get_extra_constants_common(const struct svga_context *svga, const struct svga_shader_variant *variant, enum pipe_shader_type shader, float *dest) { @@ -72,9 +72,9 @@ svga_get_extra_constants_common(struct svga_context *svga, unsigned count = 0; for (i = 0; i < variant->key.num_textures; i++) { - struct pipe_sampler_view *sv = svga->curr.sampler_views[shader][i]; + const struct pipe_sampler_view *sv = svga->curr.sampler_views[shader][i]; if (sv) { - struct pipe_resource *tex = sv->texture; + const struct pipe_resource *tex = sv->texture; /* Scaling factors needed for handling unnormalized texture coordinates * for texture rectangles. */ @@ -82,10 +82,10 @@ svga_get_extra_constants_common(struct svga_context *svga, /* debug/sanity check */ assert(variant->key.tex[i].width_height_idx == count); - *dest++ = 1.0 / (float)tex->width0; - *dest++ = 1.0 / (float)tex->height0; - *dest++ = 1.0; - *dest++ = 1.0; + *dest++ = 1.0f / (float) tex->width0; + *dest++ = 1.0f / (float) tex->height0; + *dest++ = 1.0f; + *dest++ = 1.0f; count++; } @@ -114,7 +114,7 @@ svga_get_extra_constants_common(struct svga_context *svga, * \return number of float[4] constants put into the dest buffer */ static unsigned -svga_get_extra_fs_constants(struct svga_context *svga, float *dest) +svga_get_extra_fs_constants(const struct svga_context *svga, float *dest) { const struct svga_shader_variant *variant = svga->state.hw_draw.fs; unsigned count = 0; @@ -133,7 +133,7 @@ svga_get_extra_fs_constants(struct svga_context *svga, float *dest) * will be returned in 'dest'. */ static unsigned -svga_get_prescale_constants(struct svga_context *svga, float **dest) +svga_get_prescale_constants(const struct svga_context *svga, float **dest) { memcpy(*dest, svga->state.hw_clear.prescale.scale, 4 * sizeof(float)); *dest += 4; @@ -148,9 +148,9 @@ svga_get_prescale_constants(struct svga_context *svga, float **dest) * Emit extra constants needed for point sprite emulation. */ static unsigned -svga_get_pt_sprite_constants(struct svga_context *svga, float **dest) +svga_get_pt_sprite_constants(const struct svga_context *svga, float **dest) { - struct svga_screen *screen = svga_screen(svga->pipe.screen); + const struct svga_screen *screen = svga_screen(svga->pipe.screen); float *dst = *dest; dst[0] = 1.0 / (svga->curr.viewport.scale[0] * 2); @@ -166,7 +166,7 @@ svga_get_pt_sprite_constants(struct svga_context *svga, float **dest) * by '*dest'. The updated buffer pointer will be returned in 'dest'. */ static unsigned -svga_get_clip_plane_constants(struct svga_context *svga, +svga_get_clip_plane_constants(const struct svga_context *svga, const struct svga_shader_variant *variant, float **dest) { @@ -195,7 +195,7 @@ svga_get_clip_plane_constants(struct svga_context *svga, * \return number of float[4] constants put into the dest buffer */ static unsigned -svga_get_extra_vs_constants(struct svga_context *svga, float *dest) +svga_get_extra_vs_constants(const struct svga_context *svga, float *dest) { const struct svga_shader_variant *variant = svga->state.hw_draw.vs; unsigned count = 0; @@ -233,7 +233,7 @@ svga_get_extra_vs_constants(struct svga_context *svga, float *dest) * to by 'dest'. */ static unsigned -svga_get_extra_gs_constants(struct svga_context *svga, float *dest) +svga_get_extra_gs_constants(const struct svga_context *svga, float *dest) { const struct svga_shader_variant *variant = svga->state.hw_draw.gs; unsigned count = 0; @@ -264,50 +264,6 @@ svga_get_extra_gs_constants(struct svga_context *svga, float *dest) return count; } -/** - * Check and emit one shader constant register. - * \param shader PIPE_SHADER_FRAGMENT or PIPE_SHADER_VERTEX - * \param i which float[4] constant to change - * \param value the new float[4] value - */ -static enum pipe_error -emit_const(struct svga_context *svga, enum pipe_shader_type shader, unsigned i, - const float *value) -{ - enum pipe_error ret = PIPE_OK; - - assert(shader < PIPE_SHADER_TYPES); - assert(i < SVGA3D_CONSTREG_MAX); - assert(!svga_have_vgpu10(svga)); - - if (memcmp(svga->state.hw_draw.cb[shader][i], value, - 4 * sizeof(float)) != 0) { - if (SVGA_DEBUG & DEBUG_CONSTS) - debug_printf("%s %s %u: %f %f %f %f\n", - __FUNCTION__, - shader == PIPE_SHADER_VERTEX ? "VERT" : "FRAG", - i, - value[0], - value[1], - value[2], - value[3]); - - ret = SVGA3D_SetShaderConst( svga->swc, - i, - svga_shader_type(shader), - SVGA3D_CONST_TYPE_FLOAT, - value ); - if (ret != PIPE_OK) - return ret; - - memcpy(svga->state.hw_draw.cb[shader][i], value, 4 * sizeof(float)); - - svga->hud.num_const_updates++; - } - - return ret; -} - /* * Check and emit a range of shader constant registers, trying to coalesce @@ -442,11 +398,9 @@ static enum pipe_error emit_consts_vgpu9(struct svga_context *svga, enum pipe_shader_type shader) { const struct pipe_constant_buffer *cbuf; - struct svga_screen *ss = svga_screen(svga->pipe.screen); struct pipe_transfer *transfer = NULL; unsigned count; const float (*data)[4] = NULL; - unsigned i; enum pipe_error ret = PIPE_OK; const unsigned offset = 0; @@ -469,24 +423,13 @@ emit_consts_vgpu9(struct svga_context *svga, enum pipe_shader_type shader) } /* sanity check */ - assert(cbuf->buffer->width0 >= - cbuf->buffer_size); + assert(cbuf->buffer->width0 >= cbuf->buffer_size); /* Use/apply the constant buffer size and offsets here */ count = cbuf->buffer_size / (4 * sizeof(float)); data += cbuf->buffer_offset / (4 * sizeof(float)); - if (ss->hw_version >= SVGA3D_HWVERSION_WS8_B1) { - ret = emit_const_range( svga, shader, offset, count, data ); - } - else { - for (i = 0; i < count; i++) { - ret = emit_const( svga, shader, offset + i, data[i] ); - if (ret != PIPE_OK) { - break; - } - } - } + ret = emit_const_range( svga, shader, offset, count, data ); pipe_buffer_unmap(&svga->pipe, transfer); @@ -500,7 +443,7 @@ emit_consts_vgpu9(struct svga_context *svga, enum pipe_shader_type shader) const struct svga_shader_variant *variant = NULL; unsigned offset; float extras[MAX_EXTRA_CONSTS][4]; - unsigned count, i; + unsigned count; switch (shader) { case PIPE_SHADER_VERTEX: @@ -521,17 +464,8 @@ emit_consts_vgpu9(struct svga_context *svga, enum pipe_shader_type shader) assert(count <= ARRAY_SIZE(extras)); if (count > 0) { - if (ss->hw_version >= SVGA3D_HWVERSION_WS8_B1) { - ret = emit_const_range(svga, shader, offset, count, - (const float (*) [4])extras); - } - else { - for (i = 0; i < count; i++) { - ret = emit_const(svga, shader, offset + i, extras[i]); - if (ret != PIPE_OK) - return ret; - } - } + ret = emit_const_range(svga, shader, offset, count, + (const float (*) [4])extras); } } @@ -556,12 +490,6 @@ emit_constbuf_vgpu10(struct svga_context *svga, enum pipe_shader_type shader) const struct svga_shader_variant *variant; unsigned alloc_buf_size; - assert(shader == PIPE_SHADER_VERTEX || - shader == PIPE_SHADER_GEOMETRY || - shader == PIPE_SHADER_FRAGMENT); - - cbuf = &svga->curr.constbufs[shader][0]; - switch (shader) { case PIPE_SHADER_VERTEX: variant = svga->state.hw_draw.vs; @@ -585,6 +513,8 @@ emit_constbuf_vgpu10(struct svga_context *svga, enum pipe_shader_type shader) assert(variant); + cbuf = &svga->curr.constbufs[shader][0]; + /* Compute extra constants size and offset in bytes */ extra_size = extra_count * 4 * sizeof(float); extra_offset = 4 * sizeof(float) * variant->extra_const_start; @@ -657,7 +587,8 @@ emit_constbuf_vgpu10(struct svga_context *svga, enum pipe_shader_type shader) /* we must unmap the buffer before getting the winsys handle */ u_upload_unmap(svga->const0_upload); - dst_handle = svga_buffer_handle(svga, dst_buffer); + dst_handle = svga_buffer_handle(svga, dst_buffer, + PIPE_BIND_CONSTANT_BUFFER); if (!dst_handle) { pipe_resource_reference(&dst_buffer, NULL); return PIPE_ERROR_OUT_OF_MEMORY; @@ -726,7 +657,8 @@ emit_consts_vgpu10(struct svga_context *svga, enum pipe_shader_type shader) struct svga_winsys_surface *handle; if (buffer) { - handle = svga_buffer_handle(svga, &buffer->b.b); + handle = svga_buffer_handle(svga, &buffer->b.b, + PIPE_BIND_CONSTANT_BUFFER); enabled_constbufs |= 1 << index; } else { @@ -837,7 +769,8 @@ struct svga_tracked_state svga_hw_vs_constants = "hw vs params", (SVGA_NEW_PRESCALE | SVGA_NEW_VS_CONST_BUFFER | - SVGA_NEW_VS_VARIANT), + SVGA_NEW_VS_VARIANT | + SVGA_NEW_TEXTURE_CONSTS), emit_vs_consts }; @@ -874,8 +807,10 @@ emit_gs_consts(struct svga_context *svga, unsigned dirty) struct svga_tracked_state svga_hw_gs_constants = { "hw gs params", - (SVGA_NEW_GS_CONST_BUFFER | + (SVGA_NEW_PRESCALE | + SVGA_NEW_GS_CONST_BUFFER | SVGA_NEW_RAST | - SVGA_NEW_GS_VARIANT), + SVGA_NEW_GS_VARIANT | + SVGA_NEW_TEXTURE_CONSTS), emit_gs_consts };