Re: [Mesa-dev] [PATCH v2 1/9] gallium: Add PIPE_CAP_FRAMEBUFFER_LAYERS

Nicolai Hähnle Fri, 05 Feb 2016 11:57:38 -0800

On 05.02.2016 10:31, Brian Paul wrote:

On 02/05/2016 04:44 AM, Edward O'Callaghan wrote:

Add PIPE_CAP to determine the number of layers for
a framebuffer for GL_ARB_framebuffer_no_attachments.


Signed-off-by: Edward O'Callaghan <eocallag...@alterapraxis.com>
---
  src/gallium/docs/source/screen.rst               |  2 ++
  src/gallium/drivers/freedreno/freedreno_screen.c |  1 +
  src/gallium/drivers/i915/i915_screen.c           |  1 +
  src/gallium/drivers/ilo/ilo_screen.c             |  1 +
  src/gallium/drivers/llvmpipe/lp_screen.c         |  1 +
  src/gallium/drivers/nouveau/nv30/nv30_screen.c   |  1 +
  src/gallium/drivers/nouveau/nv50/nv50_screen.c   |  1 +
  src/gallium/drivers/nouveau/nvc0/nvc0_screen.c   |  1 +
  src/gallium/drivers/r300/r300_screen.c           |  1 +
  src/gallium/drivers/r600/r600_pipe.c             |  1 +
  src/gallium/drivers/radeonsi/si_pipe.c           |  1 +
  src/gallium/drivers/softpipe/sp_screen.c         |  1 +
  src/gallium/drivers/svga/svga_screen.c           |  1 +
  src/gallium/drivers/vc4/vc4_screen.c             |  1 +
  src/gallium/drivers/virgl/virgl_screen.c         |  1 +
  src/gallium/include/pipe/p_defines.h             |  1 +
  src/mesa/state_tracker/st_extensions.c           | 13 +++++++++++++
  17 files changed, 30 insertions(+)

diff --git a/src/gallium/docs/source/screen.rst
b/src/gallium/docs/source/screen.rst
index 3324bcc..d0d8aef 100644
--- a/src/gallium/docs/source/screen.rst
+++ b/src/gallium/docs/source/screen.rst
@@ -319,6 +319,8 @@ The integer capabilities:
    adjusted appropriately.
  * ``PIPE_CAP_QUERY_BUFFER_OBJECT``: Driver supports
    context::get_query_result_resource callback.
+* ``PIPE_CAP_MAX_FRAMEBUFFER_LAYERS``: Whether
`framebuffer_no_attachments`
+  will be available in contexts.


Perhaps you didn't see my comment about this the first time.

The PIPE_CAP name and the description don't really agree (uint vs.
boolean) and, at face value, don't even seem related.

I think a better description would be "maximum number of layers
supported for shader load/store instructions when operating on layered
resources (such as array textures).  If non-zero, rendering to
framebuffers with no surface attachments is supported."


I'm not so sure that that's the meaning of the corresponding GL constant.

The way I understood the extension language was that it's unrelated towhat shader load/store can do, and simply means that via a no-attachmentframebuffer, you might be able to rasterize a primitive on a layer thatis larger than the number of layers supported by either rendering ortextures.


In any case, this description does need to be fixed.

Cheers,
Nicolai


-Brian



  .. _pipe_capf:
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c
b/src/gallium/drivers/freedreno/freedreno_screen.c
index f67c160..5b63d03 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -251,6 +251,7 @@ fd_screen_get_param(struct pipe_screen *pscreen,
enum pipe_cap param)
      case PIPE_CAP_INVALIDATE_BUFFER:
      case PIPE_CAP_GENERATE_MIPMAP:
      case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
+    case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
          return 0;

      case PIPE_CAP_MAX_VIEWPORTS:
diff --git a/src/gallium/drivers/i915/i915_screen.c
b/src/gallium/drivers/i915/i915_screen.c
index 31856ad..a32a6f4 100644
--- a/src/gallium/drivers/i915/i915_screen.c
+++ b/src/gallium/drivers/i915/i915_screen.c
@@ -264,6 +264,7 @@ i915_get_param(struct pipe_screen *screen, enum
pipe_cap cap)
     case PIPE_CAP_STRING_MARKER:
     case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;

     case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
diff --git a/src/gallium/drivers/ilo/ilo_screen.c
b/src/gallium/drivers/ilo/ilo_screen.c
index 7c77197..ea6d85b 100644
--- a/src/gallium/drivers/ilo/ilo_screen.c
+++ b/src/gallium/drivers/ilo/ilo_screen.c
@@ -490,6 +490,7 @@ ilo_get_param(struct pipe_screen *screen, enum
pipe_cap param)
     case PIPE_CAP_STRING_MARKER:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
     case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;

     case PIPE_CAP_VENDOR_ID:
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c
b/src/gallium/drivers/llvmpipe/lp_screen.c
index 1731681..24456ef 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -314,6 +314,7 @@ llvmpipe_get_param(struct pipe_screen *screen,
enum pipe_cap param)
     case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
     case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;
     }
     /* should only get here on unhandled cases */
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
index 4f09b74..f46c4cc 100644
--- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
+++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
@@ -187,6 +187,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen,
enum pipe_cap param)
     case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
     case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;

     case PIPE_CAP_VENDOR_ID:
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index e0b93b7..63de3d0 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -230,6 +230,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen,
enum pipe_cap param)
     case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
     case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;

     case PIPE_CAP_VENDOR_ID:
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 45693c8..602475d 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -220,6 +220,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen,
enum pipe_cap param)
     case PIPE_CAP_STRING_MARKER:
     case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;

     case PIPE_CAP_VENDOR_ID:
diff --git a/src/gallium/drivers/r300/r300_screen.c
b/src/gallium/drivers/r300/r300_screen.c
index cca5936..9e11951 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -213,6 +213,7 @@ static int r300_get_param(struct pipe_screen*
pscreen, enum pipe_cap param)
          case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
          case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
          case PIPE_CAP_QUERY_BUFFER_OBJECT:
+    case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
              return 0;

          /* SWTCL-only features. */
diff --git a/src/gallium/drivers/r600/r600_pipe.c
b/src/gallium/drivers/r600/r600_pipe.c
index 0129750..36297f3 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -369,6 +369,7 @@ static int r600_get_param(struct pipe_screen*
pscreen, enum pipe_cap param)
      case PIPE_CAP_GENERATE_MIPMAP:
      case PIPE_CAP_STRING_MARKER:
      case PIPE_CAP_QUERY_BUFFER_OBJECT:
+    case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
          return 0;

      case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c
b/src/gallium/drivers/radeonsi/si_pipe.c
index f564f01..d3f3677 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -361,6 +361,7 @@ static int si_get_param(struct pipe_screen*
pscreen, enum pipe_cap param)
      case PIPE_CAP_GENERATE_MIPMAP:
      case PIPE_CAP_STRING_MARKER:
      case PIPE_CAP_QUERY_BUFFER_OBJECT:
+    case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
          return 0;

      case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
diff --git a/src/gallium/drivers/softpipe/sp_screen.c
b/src/gallium/drivers/softpipe/sp_screen.c
index 1738cae..75618ab 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -265,6 +265,7 @@ softpipe_get_param(struct pipe_screen *screen,
enum pipe_cap param)
     case PIPE_CAP_STRING_MARKER:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
     case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;
     }
     /* should only get here on unhandled cases */
diff --git a/src/gallium/drivers/svga/svga_screen.c
b/src/gallium/drivers/svga/svga_screen.c
index eeed59c..57e2ad4 100644
--- a/src/gallium/drivers/svga/svga_screen.c
+++ b/src/gallium/drivers/svga/svga_screen.c
@@ -399,6 +399,7 @@ svga_get_param(struct pipe_screen *screen, enum
pipe_cap param)
     case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL:
     case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
     case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;
     }

diff --git a/src/gallium/drivers/vc4/vc4_screen.c
b/src/gallium/drivers/vc4/vc4_screen.c
index 371f662..6e04a73 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -202,6 +202,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen,
enum pipe_cap param)
          case PIPE_CAP_STRING_MARKER:
          case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
          case PIPE_CAP_QUERY_BUFFER_OBJECT:
+    case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
                  return 0;

                  /* Stream output. */
diff --git a/src/gallium/drivers/virgl/virgl_screen.c
b/src/gallium/drivers/virgl/virgl_screen.c
index 18263e9..14db63a 100644
--- a/src/gallium/drivers/virgl/virgl_screen.c
+++ b/src/gallium/drivers/virgl/virgl_screen.c
@@ -232,6 +232,7 @@ virgl_get_param(struct pipe_screen *screen, enum
pipe_cap param)
     case PIPE_CAP_GENERATE_MIPMAP:
     case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
     case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_MAX_FRAMEBUFFER_LAYERS:
        return 0;
     case PIPE_CAP_VENDOR_ID:
        return 0x1af4;
diff --git a/src/gallium/include/pipe/p_defines.h
b/src/gallium/include/pipe/p_defines.h
index 75b9bf9..4ee0778 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -651,6 +651,7 @@ enum pipe_cap
     PIPE_CAP_STRING_MARKER,
     PIPE_CAP_SURFACE_REINTERPRET_BLOCKS,
     PIPE_CAP_QUERY_BUFFER_OBJECT,
+   PIPE_CAP_MAX_FRAMEBUFFER_LAYERS,
  };

  #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0)
diff --git a/src/mesa/state_tracker/st_extensions.c
b/src/mesa/state_tracker/st_extensions.c
index 63a0043..722526f 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -490,6 +490,7 @@ void st_init_extensions(struct pipe_screen *screen,
        { o(ARB_fragment_program_shadow),
PIPE_CAP_TEXTURE_SHADOW_MAP               },
        { o(ARB_framebuffer_object),
PIPE_CAP_MIXED_FRAMEBUFFER_SIZES          },
        { o(ARB_indirect_parameters),
PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS       },
+      { o(ARB_framebuffer_no_attachments),
PIPE_CAP_MAX_FRAMEBUFFER_LAYERS           },
        { o(ARB_instanced_arrays),
PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR  },
        { o(ARB_occlusion_query),
PIPE_CAP_OCCLUSION_QUERY                  },
        { o(ARB_occlusion_query2),
PIPE_CAP_OCCLUSION_QUERY                  },
@@ -963,6 +964,18 @@ void st_init_extensions(struct pipe_screen *screen,
           extensions->AMD_vertex_shader_viewport_index = GL_TRUE;
     }

+   /* ARB_framebuffer_no_attachments */
+   consts->MaxFramebufferWidth   = consts->MaxViewportWidth;
+   consts->MaxFramebufferHeight  = consts->MaxViewportHeight;
+   consts->MaxFramebufferSamples = consts->MaxSamples;
+   consts->MaxFramebufferLayers
+      = screen->get_param(screen, PIPE_CAP_MAX_FRAMEBUFFER_LAYERS);
+   if ((consts->MaxSamples >= 4 && consts->MaxFramebufferLayers >= 2048)
+      || (consts->MaxFramebufferSamples >= consts->MaxSamples &&
+          consts->MaxFramebufferLayers  >=
consts->MaxArrayTextureLayers))
+      extensions->ARB_framebuffer_no_attachments = GL_TRUE;
+
+
     /* GL_ARB_ES3_compatibility.
      *
      * Assume that ES3 is supported if GLSL 3.30 is supported.


_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH v2 1/9] gallium: Add PIPE_CAP_FRAMEBUFFER_LAYERS

Reply via email to