**********************************************************/
#include "util/u_inlines.h"
+#include "util/u_memory.h"
#include "pipe/p_defines.h"
#include "svga_screen.h"
#include "svga_cmd.h"
#include "svga_tgsi.h"
#include "svga_debug.h"
+#include "svga_resource_buffer.h"
#include "svga_hw_reg.h"
*/
#define MAX_CONST_REG_COUNT 256 /**< number of float[4] constants */
+/**
+ * Extra space for svga-specific VS/PS constants (such as texcoord
+ * scale factors, vertex transformation scale/translation).
+ */
+#define MAX_EXTRA_CONSTS 32
+/** Guest-backed surface constant buffers must be this size */
+#define GB_CONSTBUF_SIZE (SVGA3D_CONSTREG_MAX)
/**
* Convert from PIPE_SHADER_* to SVGA3D_SHADERTYPE_*
*/
-static int
+static unsigned
svga_shader_type(unsigned shader)
{
- assert(PIPE_SHADER_VERTEX + 1 == SVGA3D_SHADERTYPE_VS);
- assert(PIPE_SHADER_FRAGMENT + 1 == SVGA3D_SHADERTYPE_PS);
- assert(shader <= PIPE_SHADER_FRAGMENT);
- return shader + 1;
+ switch (shader) {
+ case PIPE_SHADER_VERTEX:
+ return SVGA3D_SHADERTYPE_VS;
+ case PIPE_SHADER_FRAGMENT:
+ return SVGA3D_SHADERTYPE_PS;
+ default:
+ assert(!"Unexpected shader type");
+ return SVGA3D_SHADERTYPE_VS;
+ }
+}
+
+
+/**
+ * Emit any extra fragment shader constants into the buffer pointed
+ * to by 'dest'.
+ * In particular, these would be the scaling factors needed for handling
+ * unnormalized texture coordinates for texture rectangles.
+ * \return number of float[4] constants put into the dest buffer
+ */
+static unsigned
+svga_get_extra_fs_constants(struct svga_context *svga, float *dest)
+{
+ const struct svga_shader_variant *variant = svga->state.hw_draw.fs;
+ const struct svga_fs_compile_key *key = &variant->key.fkey;
+ unsigned count = 0;
+
+ /* SVGA_NEW_VS_VARIANT
+ */
+ if (key->num_unnormalized_coords) {
+ unsigned i;
+
+ for (i = 0; i < key->num_textures; i++) {
+ if (key->tex[i].unnormalized) {
+ struct pipe_resource *tex = svga->curr.sampler_views[i]->texture;
+
+ /* debug/sanity check */
+ assert(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;
+
+ count++;
+ }
+ }
+ }
+
+ assert(count <= MAX_EXTRA_CONSTS);
+
+ return count;
+}
+
+
+/**
+ * Emit any extra vertex shader constants into the buffer pointed
+ * to by 'dest'.
+ * In particular, these would be the scale and bias factors computed
+ * from the framebuffer size which are used to copy with differences in
+ * GL vs D3D coordinate spaces. See svga_tgsi_insn.c for more info.
+ * \return number of float[4] constants put into the dest buffer
+ */
+static unsigned
+svga_get_extra_vs_constants(struct svga_context *svga, float *dest)
+{
+ const struct svga_shader_variant *variant = svga->state.hw_draw.vs;
+ const struct svga_vs_compile_key *key = &variant->key.vkey;
+ unsigned count = 0;
+
+ /* SVGA_NEW_VS_VARIANT
+ */
+ if (key->need_prescale) {
+ memcpy(dest, svga->state.hw_clear.prescale.scale, 4 * sizeof(float));
+ dest += 4;
+
+ memcpy(dest, svga->state.hw_clear.prescale.translate, 4 * sizeof(float));
+ dest += 4;
+
+ count = 2;
+ }
+
+ assert(count <= MAX_EXTRA_CONSTS);
+
+ return count;
}
#ifdef DEBUG
if (offset + count > SVGA3D_CONSTREG_MAX) {
- debug_printf("svga: too many constants (offset + count = %u)\n",
- offset + count);
+ debug_printf("svga: too many constants (offset %u + count %u = %u (max = %u))\n",
+ offset, count, offset + count, SVGA3D_CONSTREG_MAX);
}
#endif
/* Send them all together.
*/
- ret = SVGA3D_SetShaderConsts(svga->swc,
- offset + i, j - i,
- svga_shader_type(shader),
- SVGA3D_CONST_TYPE_FLOAT,
- values + i);
+ if (svga_have_gb_objects(svga)) {
+ ret = SVGA3D_SetGBShaderConstsInline(svga->swc,
+ offset + i, /* start */
+ j - i, /* count */
+ svga_shader_type(shader),
+ SVGA3D_CONST_TYPE_FLOAT,
+ values + i);
+ }
+ else {
+ ret = SVGA3D_SetShaderConsts(svga->swc,
+ offset + i, j - i,
+ svga_shader_type(shader),
+ SVGA3D_CONST_TYPE_FLOAT,
+ values + i);
+ }
if (ret != PIPE_OK) {
return ret;
}
assert(shader < PIPE_SHADER_TYPES);
- if (svga->curr.cb[shader] == NULL)
+ if (svga->curr.cbufs[shader].buffer == NULL)
goto done;
- count = svga->curr.cb[shader]->width0 / (4 * sizeof(float));
-
data = (const float (*)[4])pipe_buffer_map(&svga->pipe,
- svga->curr.cb[shader],
+ svga->curr.cbufs[shader].buffer,
PIPE_TRANSFER_READ,
&transfer);
if (data == NULL) {
goto done;
}
+ /* sanity check */
+ assert(svga->curr.cbufs[shader].buffer->width0 >=
+ svga->curr.cbufs[shader].buffer_size);
+
+ /* Use/apply the constant buffer size and offsets here */
+ count = svga->curr.cbufs[shader].buffer_size / (4 * sizeof(float));
+ data += svga->curr.cbufs[shader].buffer_offset / (4 * sizeof(float));
+
if (ss->hw_version >= SVGA3D_HWVERSION_WS8_B1) {
ret = emit_const_range( svga, shader, offset, count, data );
if (ret != PIPE_OK) {
static enum pipe_error
emit_fs_consts(struct svga_context *svga, unsigned dirty)
{
- const struct svga_shader_result *result = svga->state.hw_draw.fs;
- const struct svga_fs_compile_key *key = &result->key.fkey;
+ struct svga_screen *ss = svga_screen(svga->pipe.screen);
+ const struct svga_shader_variant *variant = svga->state.hw_draw.fs;
enum pipe_error ret = PIPE_OK;
+ /* SVGA_NEW_FS_VARIANT
+ */
+ if (variant == NULL)
+ return PIPE_OK;
+
+ /* SVGA_NEW_FS_CONST_BUFFER
+ */
ret = emit_consts( svga, PIPE_SHADER_FRAGMENT );
if (ret != PIPE_OK)
return ret;
- /* The internally generated fragment shader for xor blending
- * doesn't have a 'result' struct. It should be fixed to avoid
- * this special case, but work around it with a NULL check:
- */
- if (result != NULL && key->num_unnormalized_coords) {
- unsigned offset = result->shader->info.file_max[TGSI_FILE_CONSTANT] + 1;
- int i;
+ /* emit extra shader constants */
+ {
+ unsigned offset = variant->shader->info.file_max[TGSI_FILE_CONSTANT] + 1;
+ float extras[MAX_EXTRA_CONSTS][4];
+ unsigned count, i;
- for (i = 0; i < key->num_textures; i++) {
- if (key->tex[i].unnormalized) {
- struct pipe_resource *tex = svga->curr.sampler_views[i]->texture;
- float data[4];
+ count = svga_get_extra_fs_constants(svga, (float *) extras);
- data[0] = 1.0 / (float)tex->width0;
- data[1] = 1.0 / (float)tex->height0;
- data[2] = 1.0;
- data[3] = 1.0;
-
- ret = emit_const( svga,
- PIPE_SHADER_FRAGMENT,
- key->tex[i].width_height_idx + offset,
- data );
+ if (ss->hw_version >= SVGA3D_HWVERSION_WS8_B1) {
+ ret = emit_const_range(svga, PIPE_SHADER_FRAGMENT, offset, count,
+ (const float (*) [4])extras);
+ } else {
+ for (i = 0; i < count; i++) {
+ ret = emit_const(svga, PIPE_SHADER_FRAGMENT, offset + i, extras[i]);
if (ret != PIPE_OK)
return ret;
}
}
-
- offset += key->num_unnormalized_coords;
}
- return PIPE_OK;
+ return ret;
}
{
"hw fs params",
(SVGA_NEW_FS_CONST_BUFFER |
- SVGA_NEW_FS_RESULT |
+ SVGA_NEW_FS_VARIANT |
SVGA_NEW_TEXTURE_BINDING),
emit_fs_consts
};
static enum pipe_error
emit_vs_consts(struct svga_context *svga, unsigned dirty)
{
- const struct svga_shader_result *result = svga->state.hw_draw.vs;
- const struct svga_vs_compile_key *key = &result->key.vkey;
+ struct svga_screen *ss = svga_screen(svga->pipe.screen);
+ const struct svga_shader_variant *variant = svga->state.hw_draw.vs;
enum pipe_error ret = PIPE_OK;
- unsigned offset;
- /* SVGA_NEW_VS_RESULT
+ /* SVGA_NEW_VS_VARIANT
*/
- if (result == NULL)
+ if (variant == NULL)
return PIPE_OK;
/* SVGA_NEW_VS_CONST_BUFFER
if (ret != PIPE_OK)
return ret;
- /* offset = number of constants in the VS const buffer */
- offset = result->shader->info.file_max[TGSI_FILE_CONSTANT] + 1;
+ /* emit extra shader constants */
+ {
+ unsigned offset = variant->shader->info.file_max[TGSI_FILE_CONSTANT] + 1;
+ float extras[MAX_EXTRA_CONSTS][4];
+ unsigned count, i;
- /* SVGA_NEW_VS_RESULT
- * Put the viewport pre-scale/translate values into the const buffer.
- */
- if (key->need_prescale) {
- ret = emit_const( svga, PIPE_SHADER_VERTEX, offset++,
- svga->state.hw_clear.prescale.scale );
- if (ret != PIPE_OK)
- return ret;
+ count = svga_get_extra_vs_constants(svga, (float *) extras);
+ assert(count <= Elements(extras));
- ret = emit_const( svga, PIPE_SHADER_VERTEX, offset++,
- svga->state.hw_clear.prescale.translate );
- if (ret != PIPE_OK)
- return ret;
+ if (ss->hw_version >= SVGA3D_HWVERSION_WS8_B1) {
+ ret = emit_const_range(svga, PIPE_SHADER_VERTEX, offset, count,
+ (const float (*) [4]) extras);
+ } else {
+ for (i = 0; i < count; i++) {
+ ret = emit_const(svga, PIPE_SHADER_VERTEX, offset + i, extras[i]);
+ if (ret != PIPE_OK)
+ return ret;
+ }
+ }
}
- return PIPE_OK;
+ return ret;
}
"hw vs params",
(SVGA_NEW_PRESCALE |
SVGA_NEW_VS_CONST_BUFFER |
- SVGA_NEW_VS_RESULT),
+ SVGA_NEW_VS_VARIANT),
emit_vs_consts
};
projects / mesa.git / blobdiff