<div dir="ltr"><div>You forgot to update a few PIPE_SHADER_CAP occurences. Also, documentation of all PIPE_CAPs is typically added into screen.rst. Other than those:</div><div><br></div><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div><br></div><div>Marek<br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 15, 2018 at 6:06 PM, Rhys Perry <span dir="ltr"><<a href="mailto:pendingchaos02@gmail.com" target="_blank">pendingchaos02@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Rhys Perry <<a href="mailto:pendingchaos02@gmail.com">pendingchaos02@gmail.com</a>><br>
---<br>
src/gallium/drivers/etnaviv/<wbr>etnaviv_screen.c | 1 +<br>
src/gallium/drivers/freedreno/<wbr>freedreno_screen.c | 1 +<br>
src/gallium/drivers/i915/i915_<wbr>screen.c | 1 +<br>
src/gallium/drivers/llvmpipe/<wbr>lp_screen.c | 1 +<br>
src/gallium/drivers/nouveau/<wbr>nv30/nv30_screen.c | 1 +<br>
src/gallium/drivers/nouveau/<wbr>nv50/nv50_screen.c | 1 +<br>
src/gallium/drivers/nouveau/<wbr>nvc0/nvc0_screen.c | 1 +<br>
src/gallium/drivers/r300/r300_<wbr>screen.c | 1 +<br>
src/gallium/drivers/r600/r600_<wbr>pipe.c | 1 +<br>
src/gallium/drivers/radeonsi/<wbr>si_get.c | 1 +<br>
src/gallium/drivers/softpipe/<wbr>sp_screen.c | 1 +<br>
src/gallium/drivers/svga/svga_<wbr>screen.c | 1 +<br>
src/gallium/drivers/swr/swr_<wbr>screen.cpp | 1 +<br>
src/gallium/drivers/v3d/v3d_<wbr>screen.c | 1 +<br>
src/gallium/drivers/vc4/vc4_<wbr>screen.c | 1 +<br>
src/gallium/drivers/virgl/<wbr>virgl_screen.c | 1 +<br>
src/gallium/include/pipe/p_<wbr>defines.h | 1 +<br>
17 files changed, 17 insertions(+)<br>
<br>
diff --git a/src/gallium/drivers/etnaviv/<wbr>etnaviv_screen.c b/src/gallium/drivers/etnaviv/<wbr>etnaviv_screen.c<br>
index e031807117..3fc7e9e47b 100644<br>
--- a/src/gallium/drivers/etnaviv/<wbr>etnaviv_screen.c<br>
+++ b/src/gallium/drivers/etnaviv/<wbr>etnaviv_screen.c<br>
@@ -281,6 +281,7 @@ etna_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
case PIPE_CAP_PACKED_UNIFORMS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
/* Stream output. */<br>
diff --git a/src/gallium/drivers/<wbr>freedreno/freedreno_screen.c b/src/gallium/drivers/<wbr>freedreno/freedreno_screen.c<br>
index a414cb6d60..3d0d2bb60f 100644<br>
--- a/src/gallium/drivers/<wbr>freedreno/freedreno_screen.c<br>
+++ b/src/gallium/drivers/<wbr>freedreno/freedreno_screen.c<br>
@@ -347,6 +347,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_CONTEXT_PRIORITY_<wbr>MASK:<br>
diff --git a/src/gallium/drivers/i915/<wbr>i915_screen.c b/src/gallium/drivers/i915/<wbr>i915_screen.c<br>
index b08d2283e7..d879c8c1ba 100644<br>
--- a/src/gallium/drivers/i915/<wbr>i915_screen.c<br>
+++ b/src/gallium/drivers/i915/<wbr>i915_screen.c<br>
@@ -333,6 +333,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap cap)<br>
case PIPE_CAP_FENCE_SIGNAL:<br>
case PIPE_CAP_CONSTBUF0_FLAGS:<br>
case PIPE_CAP_PACKED_UNIFORMS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_MAX_VIEWPORTS:<br>
diff --git a/src/gallium/drivers/<wbr>llvmpipe/lp_screen.c b/src/gallium/drivers/<wbr>llvmpipe/lp_screen.c<br>
index f12ad09298..ff8d10a86e 100644<br>
--- a/src/gallium/drivers/<wbr>llvmpipe/lp_screen.c<br>
+++ b/src/gallium/drivers/<wbr>llvmpipe/lp_screen.c<br>
@@ -370,6 +370,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
}<br>
/* should only get here on unhandled cases */<br>
diff --git a/src/gallium/drivers/nouveau/<wbr>nv30/nv30_screen.c b/src/gallium/drivers/nouveau/<wbr>nv30/nv30_screen.c<br>
index a77f70e6bb..bbf5d76f19 100644<br>
--- a/src/gallium/drivers/nouveau/<wbr>nv30/nv30_screen.c<br>
+++ b/src/gallium/drivers/nouveau/<wbr>nv30/nv30_screen.c<br>
@@ -236,6 +236,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_VENDOR_ID:<br>
diff --git a/src/gallium/drivers/nouveau/<wbr>nv50/nv50_screen.c b/src/gallium/drivers/nouveau/<wbr>nv50/nv50_screen.c<br>
index 2495a545fd..9e482128f4 100644<br>
--- a/src/gallium/drivers/nouveau/<wbr>nv50/nv50_screen.c<br>
+++ b/src/gallium/drivers/nouveau/<wbr>nv50/nv50_screen.c<br>
@@ -289,6 +289,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_VENDOR_ID:<br>
diff --git a/src/gallium/drivers/nouveau/<wbr>nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/<wbr>nvc0/nvc0_screen.c<br>
index f679cbdba3..4c31bb4347 100644<br>
--- a/src/gallium/drivers/nouveau/<wbr>nvc0/nvc0_screen.c<br>
+++ b/src/gallium/drivers/nouveau/<wbr>nvc0/nvc0_screen.c<br>
@@ -319,6 +319,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSTBUF0_FLAGS:<br>
case PIPE_CAP_PACKED_UNIFORMS:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_VENDOR_ID:<br>
diff --git a/src/gallium/drivers/r300/<wbr>r300_screen.c b/src/gallium/drivers/r300/<wbr>r300_screen.c<br>
index 459349e821..6a12457aed 100644<br>
--- a/src/gallium/drivers/r300/<wbr>r300_screen.c<br>
+++ b/src/gallium/drivers/r300/<wbr>r300_screen.c<br>
@@ -258,6 +258,7 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
/* SWTCL-only features. */<br>
diff --git a/src/gallium/drivers/r600/<wbr>r600_pipe.c b/src/gallium/drivers/r600/<wbr>r600_pipe.c<br>
index ff7306998b..9e4dae7fbe 100644<br>
--- a/src/gallium/drivers/r600/<wbr>r600_pipe.c<br>
+++ b/src/gallium/drivers/r600/<wbr>r600_pipe.c<br>
@@ -428,6 +428,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_DOUBLES:<br>
diff --git a/src/gallium/drivers/<wbr>radeonsi/si_get.c b/src/gallium/drivers/<wbr>radeonsi/si_get.c<br>
index 01050cf02b..db7dc5f8e6 100644<br>
--- a/src/gallium/drivers/<wbr>radeonsi/si_get.c<br>
+++ b/src/gallium/drivers/<wbr>radeonsi/si_get.c<br>
@@ -257,6 +257,7 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_FENCE_SIGNAL:<br>
diff --git a/src/gallium/drivers/<wbr>softpipe/sp_screen.c b/src/gallium/drivers/<wbr>softpipe/sp_screen.c<br>
index f9c916d938..49ac10c2e2 100644<br>
--- a/src/gallium/drivers/<wbr>softpipe/sp_screen.c<br>
+++ b/src/gallium/drivers/<wbr>softpipe/sp_screen.c<br>
@@ -322,6 +322,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
case PIPE_CAP_SHADER_BUFFER_OFFSET_<wbr>ALIGNMENT:<br>
return 4;<br>
diff --git a/src/gallium/drivers/svga/<wbr>svga_screen.c b/src/gallium/drivers/svga/<wbr>svga_screen.c<br>
index 2744f3100e..1dc86cf3ff 100644<br>
--- a/src/gallium/drivers/svga/<wbr>svga_screen.c<br>
+++ b/src/gallium/drivers/svga/<wbr>svga_screen.c<br>
@@ -468,6 +468,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param)<br>
case PIPE_CAP_FENCE_SIGNAL:<br>
case PIPE_CAP_CONSTBUF0_FLAGS:<br>
case PIPE_CAP_PACKED_UNIFORMS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
}<br>
<br>
diff --git a/src/gallium/drivers/swr/swr_<wbr>screen.cpp b/src/gallium/drivers/swr/swr_<wbr>screen.cpp<br>
index 091d322d38..fb7265cc79 100644<br>
--- a/src/gallium/drivers/swr/swr_<wbr>screen.cpp<br>
+++ b/src/gallium/drivers/swr/swr_<wbr>screen.cpp<br>
@@ -355,6 +355,7 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
<br>
case PIPE_CAP_VENDOR_ID:<br>
diff --git a/src/gallium/drivers/v3d/v3d_<wbr>screen.c b/src/gallium/drivers/v3d/v3d_<wbr>screen.c<br>
index d578265eef..b1f156d5e5 100644<br>
--- a/src/gallium/drivers/v3d/v3d_<wbr>screen.c<br>
+++ b/src/gallium/drivers/v3d/v3d_<wbr>screen.c<br>
@@ -409,6 +409,7 @@ v3d_screen_get_shader_param(<wbr>struct pipe_screen *pscreen, unsigned shader,<br>
case PIPE_SHADER_CAP_TGSI_SQRT_<wbr>SUPPORTED:<br>
case PIPE_SHADER_CAP_MAX_HW_ATOMIC_<wbr>COUNTERS:<br>
case PIPE_SHADER_CAP_MAX_HW_ATOMIC_<wbr>COUNTER_BUFFERS:<br>
+ case PIPE_SHADER_CAP_IMAGE_LOAD_<wbr>FORMATTED:<br>
return 0;<br>
case PIPE_SHADER_CAP_MAX_TEXTURE_<wbr>SAMPLERS:<br>
case PIPE_SHADER_CAP_MAX_SAMPLER_<wbr>VIEWS:<br>
diff --git a/src/gallium/drivers/vc4/vc4_<wbr>screen.c b/src/gallium/drivers/vc4/vc4_<wbr>screen.c<br>
index 6415d95746..29fc22b112 100644<br>
--- a/src/gallium/drivers/vc4/vc4_<wbr>screen.c<br>
+++ b/src/gallium/drivers/vc4/vc4_<wbr>screen.c<br>
@@ -463,6 +463,7 @@ vc4_screen_get_shader_param(<wbr>struct pipe_screen *pscreen,<br>
case PIPE_SHADER_CAP_TGSI_SKIP_<wbr>MERGE_REGISTERS:<br>
case PIPE_SHADER_CAP_MAX_HW_ATOMIC_<wbr>COUNTERS:<br>
case PIPE_SHADER_CAP_MAX_HW_ATOMIC_<wbr>COUNTER_BUFFERS:<br>
+ case PIPE_SHADER_CAP_IMAGE_LOAD_<wbr>FORMATTED:<br>
return 0;<br>
default:<br>
fprintf(stderr, "unknown shader param %d\n", param);<br>
diff --git a/src/gallium/drivers/virgl/<wbr>virgl_screen.c b/src/gallium/drivers/virgl/<wbr>virgl_screen.c<br>
index e8d1c75177..00741eeea9 100644<br>
--- a/src/gallium/drivers/virgl/<wbr>virgl_screen.c<br>
+++ b/src/gallium/drivers/virgl/<wbr>virgl_screen.c<br>
@@ -291,6 +291,7 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param)<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES:<br>
case PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE:<br>
case PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS:<br>
+ case PIPE_CAP_IMAGE_LOAD_FORMATTED:<br>
return 0;<br>
case PIPE_CAP_VENDOR_ID:<br>
return 0x1af4;<br>
diff --git a/src/gallium/include/pipe/p_<wbr>defines.h b/src/gallium/include/pipe/p_<wbr>defines.h<br>
index 6cc73a31bf..78d7a18ba7 100644<br>
--- a/src/gallium/include/pipe/p_<wbr>defines.h<br>
+++ b/src/gallium/include/pipe/p_<wbr>defines.h<br>
@@ -813,6 +813,7 @@ enum pipe_cap<br>
PIPE_CAP_CONSERVATIVE_RASTER_<wbr>PRE_SNAP_POINTS_LINES,<br>
PIPE_CAP_MAX_CONSERVATIVE_<wbr>RASTER_SUBPIXEL_PRECISION_<wbr>BIAS,<br>
PIPE_CAP_CONSERVATIVE_RASTER_<wbr>POST_DEPTH_COVERAGE,<br>
+ PIPE_CAP_IMAGE_LOAD_FORMATTED,<br>
};<br>
<br>
/**<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.14.4<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>