diff options
| author | Nicolai Hähnle <[email protected]> | 2016-03-17 19:53:36 -0500 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2016-04-12 20:13:49 -0500 |
| commit | 10cfd7a6045ffbfd0debf66d2dfd2caeeb559951 (patch) | |
| tree | 83af0e8817e077905c096ef316935f93ed49e8bd | |
| parent | 047e3264f67bc54365be7b0e163b6910a9e9de3a (diff) | |
radeonsi: enable GLSL 4.20 and therefore OpenGL 4.2
This is the last necessary bit for OpenGL 4.2 support. All driver-specific
functionality has already been implemented as part of extensions.
Reviewed-by: Edward O'Callaghan <[email protected]>
| -rw-r--r-- | docs/GL3.txt | 2 | ||||
| -rw-r--r-- | docs/relnotes/11.3.0.html | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt index 7535dc5f810..39f512272a5 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -146,7 +146,7 @@ GL 4.1, GLSL 4.10 --- all DONE: nvc0, r600, radeonsi GL_ARB_viewport_array DONE (i965, nv50, llvmpipe, softpipe) -GL 4.2, GLSL 4.20: +GL 4.2, GLSL 4.20 -- all DONE: radeonsi GL_ARB_texture_compression_bptc DONE (i965, nvc0, r600, radeonsi) GL_ARB_compressed_texture_pixel_storage DONE (all drivers) diff --git a/docs/relnotes/11.3.0.html b/docs/relnotes/11.3.0.html index 9860ab0a09c..1815cfcde2f 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 6b4b3d2d063..1dd733819f1 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); |