Reviewed-by: Edward O'Callaghan <eocallag...@alterapraxis.com>
On 2016-04-13 07:42, Nicolai Hähnle wrote:
From: Nicolai Hähnle <nicolai.haeh...@amd.com>
This is the last necessary bit for OpenGL 4.2 support. All
driver-specific
functionality has already been implemented as part of extensions.
---
docs/relnotes/11.3.0.html | 7 ++++---
src/gallium/drivers/radeonsi/si_pipe.c | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docs/relnotes/11.3.0.html b/docs/relnotes/11.3.0.html
index 9860ab0..1815cfc 100644
--- a/docs/relnotes/11.3.0.html
+++ b/docs/relnotes/11.3.0.html
@@ -22,11 +22,11 @@ People who are concerned with stability and
reliability should stick
with a previous release or wait for Mesa 11.3.1.
</p>
<p>
-Mesa 11.3.0 implements the OpenGL 4.1 API, but the version reported by
+Mesa 11.3.0 implements the OpenGL 4.2 API, but the version reported by
glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being
used.
-Some drivers don't support all the features required in OpenGL 4.1.
OpenGL
-4.1 is <strong>only</strong> available if requested at context
creation
+Some drivers don't support all the features required in OpenGL 4.2.
OpenGL
+4.2 is <strong>only</strong> available if requested at context
creation
because compatibility contexts are not supported.
</p>
@@ -44,6 +44,7 @@ Note: some of the new features are only available
with certain drivers.
</p>
<ul>
+<li>OpenGL 4.2 on radeonsi</li>
<li>GL_ARB_framebuffer_no_attachments on nvc0, r600, radeonsi</li>
<li>GL_ARB_internalformat_query2 on all drivers</li>
<li>GL_ARB_robust_buffer_access_behavior on radeonsi</li>
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c
b/src/gallium/drivers/radeonsi/si_pipe.c
index 6b4b3d2..1dd7338 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -336,7 +336,8 @@ static int si_get_param(struct pipe_screen*
pscreen, enum pipe_cap param)
return 4;
case PIPE_CAP_GLSL_FEATURE_LEVEL:
- return HAVE_LLVM >= 0x0307 ? 410 : 330;
+ return HAVE_LLVM >= 0x0309 ? 420 :
+ HAVE_LLVM >= 0x0307 ? 410 : 330;
case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
return MIN2(sscreen->b.info.vram_size, 0xFFFFFFFF);
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
