commit 375d099b5961dfc97c8068a1ec9abda841767820
author Chia-I Wu <olvaffe@gmail.com> Mon Aug 18 23:38:23 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Tue Aug 19 09:12:02 2014 +0800
tree 2561df91ee4d26c7cacaece60df38c71b40a0a24
parent a5714e89f3e9aab6271dcd4d31b3da74a7e185e1

intel: sampler_init() instead of emit_sampler()

icd/intel/sampler.c

diff --git a/icd/intel/sampler.c b/icd/intel/sampler.c
index 773c872..6c6011a 100644
--- a/icd/intel/sampler.c
+++ b/icd/intel/sampler.c
@@ -172,9 +172,9 @@
 }
 
 static void
-emit_sampler(const struct intel_gpu *gpu,
-             const XGL_SAMPLER_CREATE_INFO *info,
-             uint32_t cmd[15])
+sampler_init(struct intel_sampler *sampler,
+             const struct intel_gpu *gpu,
+             const XGL_SAMPLER_CREATE_INFO *info)
 {
    int mip_filter, min_filter, mag_filter, max_aniso;
    int lod_bias, max_lod, min_lod;
@@ -183,6 +183,7 @@
    float border_color[4];
 
    INTEL_GPU_ASSERT(gpu, 6, 7.5);
+   STATIC_ASSERT(ARRAY_SIZE(sampler->cmd) >= 15);
 
    mip_filter = translate_tex_mipmap_mode(info->mipMode);
    min_filter = translate_tex_filter(info->minFilter);
@@ -298,11 +299,11 @@
              wrap_t << 3 |
              wrap_r;
 
-      cmd[0] = dw0;
-      cmd[1] = dw1;
-      cmd[2] = dw3;
+      sampler->cmd[0] = dw0;
+      sampler->cmd[1] = dw1;
+      sampler->cmd[2] = dw3;
 
-      memcpy(&cmd[3], &border_color, sizeof(border_color));
+      memcpy(&sampler->cmd[3], &border_color, sizeof(border_color));
    }
    else {
       dw0 = 1 << 28 |
@@ -342,11 +343,11 @@
                  GEN6_SAMPLER_DW3_R_MAG_ROUND);
       }
 
-      cmd[0] = dw0;
-      cmd[1] = dw1;
-      cmd[2] = dw3;
+      sampler->cmd[0] = dw0;
+      sampler->cmd[1] = dw1;
+      sampler->cmd[2] = dw3;
 
-      emit_border_color_gen6(gpu, border_color, &cmd[3]);
+      emit_border_color_gen6(gpu, border_color, &sampler->cmd[3]);
    }
 }
 
@@ -370,7 +371,7 @@
 
     sampler->obj.destroy = sampler_destroy;
 
-    emit_sampler(dev->gpu, info, sampler->cmd);
+    sampler_init(sampler, dev->gpu, info);
 
     *sampler_ret = sampler;