Merge branch 'gallium-polygon-stipple'

[mesa.git] / src / gallium / auxiliary / vl / vl_zscan.c

diff --git a/src/gallium/auxiliary/vl/vl_zscan.c b/src/gallium/auxiliary/vl/vl_zscan.c
index 4af3962209fc0c2149cb4834093bf5263f48274a..fde27f396c526215fe042ab7f7b9a96245646d76 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_zscan.c
+++ b/src/gallium/auxiliary/vl/vl_zscan.c
@@ -33,6 +33,7 @@
 #include <util/u_draw.h>
 #include <util/u_sampler.h>
 #include <util/u_inlines.h>
+#include <util/u_memory.h>
 
 #include <tgsi/tgsi_ureg.h>
 
@@ -92,11 +93,12 @@ create_vert_shader(struct vl_zscan *zscan)
 {
    struct ureg_program *shader;
 
-   struct ureg_src scale, instance;
-   struct ureg_src vrect, vpos;
+   struct ureg_src scale;
+   struct ureg_src vrect, vpos, block_num;
 
    struct ureg_dst tmp;
-   struct ureg_dst o_vpos, o_vtex[zscan->num_channels];
+   struct ureg_dst o_vpos;
+   struct ureg_dst *o_vtex;
 
    signed i;
 
@@ -104,14 +106,15 @@ create_vert_shader(struct vl_zscan *zscan)
    if (!shader)
       return NULL;
 
+   o_vtex = MALLOC(zscan->num_channels * sizeof(struct ureg_dst));
+
    scale = ureg_imm2f(shader,
       (float)BLOCK_WIDTH / zscan->buffer_width,
       (float)BLOCK_HEIGHT / zscan->buffer_height);
 
-   instance = ureg_DECL_system_value(shader, 0, TGSI_SEMANTIC_INSTANCEID, 0);
-
    vrect = ureg_DECL_vs_input(shader, VS_I_RECT);
    vpos = ureg_DECL_vs_input(shader, VS_I_VPOS);
+   block_num = ureg_DECL_vs_input(shader, VS_I_BLOCK_NUM);
 
    tmp = ureg_DECL_temporary(shader);
 
@@ -136,7 +139,7 @@ create_vert_shader(struct vl_zscan *zscan)
    ureg_MUL(shader, ureg_writemask(o_vpos, TGSI_WRITEMASK_XY), ureg_src(tmp), scale);
    ureg_MOV(shader, ureg_writemask(o_vpos, TGSI_WRITEMASK_ZW), ureg_imm1f(shader, 1.0f));
 
-   ureg_MUL(shader, ureg_writemask(tmp, TGSI_WRITEMASK_XW), ureg_scalar(instance, TGSI_SWIZZLE_X),
+   ureg_MUL(shader, ureg_writemask(tmp, TGSI_WRITEMASK_XW), ureg_scalar(block_num, TGSI_SWIZZLE_X),
             ureg_imm1f(shader, 1.0f / zscan->blocks_per_line));
 
    ureg_FRC(shader, ureg_writemask(tmp, TGSI_WRITEMASK_Y), ureg_scalar(ureg_src(tmp), TGSI_SWIZZLE_X));
@@ -157,6 +160,8 @@ create_vert_shader(struct vl_zscan *zscan)
    ureg_release_temporary(shader, tmp);
    ureg_END(shader);
 
+   FREE(o_vtex);
+
    return ureg_create_shader_and_destroy(shader, zscan->pipe);
 }
 
@@ -164,11 +169,11 @@ static void *
 create_frag_shader(struct vl_zscan *zscan)
 {
    struct ureg_program *shader;
-   struct ureg_src vtex[zscan->num_channels];
+   struct ureg_src *vtex;
 
    struct ureg_src samp_src, samp_scan, samp_quant;
 
-   struct ureg_dst tmp[zscan->num_channels];
+   struct ureg_dst *tmp;
    struct ureg_dst quant, fragment;
 
    unsigned i;
@@ -177,6 +182,9 @@ create_frag_shader(struct vl_zscan *zscan)
    if (!shader)
       return NULL;
 
+   vtex = MALLOC(zscan->num_channels * sizeof(struct ureg_src));
+   tmp = MALLOC(zscan->num_channels * sizeof(struct ureg_dst));
+
    for (i = 0; i < zscan->num_channels; ++i)
       vtex[i] = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_GENERIC, VS_O_VTEX + i, TGSI_INTERPOLATE_LINEAR);
 
@@ -213,6 +221,9 @@ create_frag_shader(struct vl_zscan *zscan)
       ureg_release_temporary(shader, tmp[i]);
    ureg_END(shader);
 
+   FREE(vtex);
+   FREE(tmp);
+
    return ureg_create_shader_and_destroy(shader, zscan->pipe);
 }
 
@@ -526,26 +537,23 @@ vl_zscan_set_layout(struct vl_zscan_buffer *buffer, struct pipe_sampler_view *la
 }
 
 void
-vl_zscan_upload_quant(struct vl_zscan_buffer *buffer,
-                      const uint8_t intra_matrix[64],
-                      const uint8_t non_intra_matrix[64])
+vl_zscan_upload_quant(struct vl_zscan_buffer *buffer, const uint8_t matrix[64], bool intra)
 {
    struct pipe_context *pipe;
    struct pipe_transfer *buf_transfer;
    unsigned x, y, i, pitch;
-   uint8_t *intra, *non_intra;
+   uint8_t *data;
 
    struct pipe_box rect =
    {
-      0, 0, 0,
+      0, 0, intra ? 1 : 0,
       BLOCK_WIDTH,
       BLOCK_HEIGHT,
-      2
+      1
    };
 
    assert(buffer);
-   assert(intra_matrix);
-   assert(non_intra_matrix);
+   assert(matrix);
 
    pipe = buffer->zscan->pipe;
 
@@ -562,18 +570,14 @@ vl_zscan_upload_quant(struct vl_zscan_buffer *buffer,
 
    pitch = buf_transfer->stride;
 
-   non_intra = pipe->transfer_map(pipe, buf_transfer);
-   if (!non_intra)
+   data = pipe->transfer_map(pipe, buf_transfer);
+   if (!data)
       goto error_map;
 
-   intra = non_intra + BLOCK_HEIGHT * pitch;
-
    for (i = 0; i < buffer->zscan->blocks_per_line; ++i)
       for (y = 0; y < BLOCK_HEIGHT; ++y)
-         for (x = 0; x < BLOCK_WIDTH; ++x) {
-            intra[i * BLOCK_WIDTH + y * pitch + x] = intra_matrix[x + y * BLOCK_WIDTH];
-            non_intra[i * BLOCK_WIDTH + y * pitch + x] = non_intra_matrix[x + y * BLOCK_WIDTH];
-         }
+         for (x = 0; x < BLOCK_WIDTH; ++x)
+            data[i * BLOCK_WIDTH + y * pitch + x] = matrix[x + y * BLOCK_WIDTH];
 
    pipe->transfer_unmap(pipe, buf_transfer);