diff options
| author | Lukasz Kalamarz <lukasz.kalamarz@intel.com> | 2018-05-25 09:15:33 +0200 |
|---|---|---|
| committer | Katarzyna Dec <katarzyna.dec@intel.com> | 2018-06-05 08:37:31 +0200 |
| commit | f506fd512eaff6fab8846c01c918cca450ddc8ef (patch) | |
| tree | ab64157321a6089d76b96c2feb122482780ed26d /lib/rendercopy_gen7.c | |
| parent | 3419ecf643dad9a2f22db9410234d879be4f827c (diff) | |
lib: Rename all surfaceformat calls in libs
This patch is renaming all surfaceformat registers to use
names introduced in surfaceformat.h instead of using
per gen definitions
v2: Drop GEN_ from register names. Applied that to
other libs.
Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Diffstat (limited to 'lib/rendercopy_gen7.c')
| -rw-r--r-- | lib/rendercopy_gen7.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c index 73513279..82e33288 100644 --- a/lib/rendercopy_gen7.c +++ b/lib/rendercopy_gen7.c @@ -75,7 +75,7 @@ gen7_bind_buf(struct intel_batchbuffer *batch, ss = intel_batchbuffer_subdata_alloc(batch, 8 * sizeof(*ss), 32); - ss[0] = (GEN7_SURFACE_2D << GEN7_SURFACE_TYPE_SHIFT | + ss[0] = (SURFACE_2D << GEN7_SURFACE_TYPE_SHIFT | gen7_tiling_bits(buf->tiling) | format << GEN7_SURFACE_FORMAT_SHIFT); ss[1] = buf->bo->offset; @@ -105,7 +105,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch) ((2 * (1 + 2)) + 1 - 2)); OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID | - GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT << GEN7_VE0_FORMAT_SHIFT | + SURFACEFORMAT_R32G32B32A32_FLOAT << GEN7_VE0_FORMAT_SHIFT | 0 << GEN7_VE0_OFFSET_SHIFT); OUT_BATCH(GEN7_VFCOMPONENT_STORE_0 << GEN7_VE1_VFCOMPONENT_0_SHIFT | @@ -115,7 +115,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch) /* x,y */ OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID | - GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT | + SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT | 0 << GEN7_VE0_OFFSET_SHIFT); /* offsets vb in bytes */ OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT | GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT | @@ -124,7 +124,7 @@ gen7_emit_vertex_elements(struct intel_batchbuffer *batch) /* s,t */ OUT_BATCH(0 << GEN7_VE0_VERTEX_BUFFER_INDEX_SHIFT | GEN7_VE0_VALID | - GEN7_SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT | + SURFACEFORMAT_R16G16_SSCALED << GEN7_VE0_FORMAT_SHIFT | 4 << GEN7_VE0_OFFSET_SHIFT); /* offset vb in bytes */ OUT_BATCH(GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_0_SHIFT | GEN7_VFCOMPONENT_STORE_SRC << GEN7_VE1_VFCOMPONENT_1_SHIFT | @@ -187,9 +187,9 @@ gen7_bind_surfaces(struct intel_batchbuffer *batch, binding_table = intel_batchbuffer_subdata_alloc(batch, 8, 32); binding_table[0] = - gen7_bind_buf(batch, dst, GEN7_SURFACEFORMAT_B8G8R8A8_UNORM, 1); + gen7_bind_buf(batch, dst, SURFACEFORMAT_B8G8R8A8_UNORM, 1); binding_table[1] = - gen7_bind_buf(batch, src, GEN7_SURFACEFORMAT_B8G8R8A8_UNORM, 0); + gen7_bind_buf(batch, src, SURFACEFORMAT_B8G8R8A8_UNORM, 0); return intel_batchbuffer_subdata_offset(batch, binding_table); } @@ -476,7 +476,7 @@ static void gen7_emit_null_depth_buffer(struct intel_batchbuffer *batch) { OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER | (7 - 2)); - OUT_BATCH(GEN7_SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT | + OUT_BATCH(SURFACE_NULL << GEN7_3DSTATE_DEPTH_BUFFER_TYPE_SHIFT | GEN7_DEPTHFORMAT_D32_FLOAT << GEN7_3DSTATE_DEPTH_BUFFER_FORMAT_SHIFT); OUT_BATCH(0); /* disable depth, stencil and hiz */ OUT_BATCH(0); |