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 <eocallaghan@alterapraxis.com>
This commit is contained in:
Nicolai Hähnle
2016-03-17 19:53:36 -05:00
parent 047e3264f6
commit 10cfd7a604
3 changed files with 7 additions and 5 deletions

View File

@@ -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_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_texture_compression_bptc DONE (i965, nvc0, r600, radeonsi)
GL_ARB_compressed_texture_pixel_storage DONE (all drivers) GL_ARB_compressed_texture_pixel_storage DONE (all drivers)

View File

@@ -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. with a previous release or wait for Mesa 11.3.1.
</p> </p>
<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) / glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. 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 Some drivers don't support all the features required in OpenGL 4.2. OpenGL
4.1 is <strong>only</strong> available if requested at context creation 4.2 is <strong>only</strong> available if requested at context creation
because compatibility contexts are not supported. because compatibility contexts are not supported.
</p> </p>
@@ -44,6 +44,7 @@ Note: some of the new features are only available with certain drivers.
</p> </p>
<ul> <ul>
<li>OpenGL 4.2 on radeonsi</li>
<li>GL_ARB_framebuffer_no_attachments on nvc0, r600, 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_internalformat_query2 on all drivers</li>
<li>GL_ARB_robust_buffer_access_behavior on radeonsi</li> <li>GL_ARB_robust_buffer_access_behavior on radeonsi</li>

View File

@@ -336,7 +336,8 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
return 4; return 4;
case PIPE_CAP_GLSL_FEATURE_LEVEL: 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: case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
return MIN2(sscreen->b.info.vram_size, 0xFFFFFFFF); return MIN2(sscreen->b.info.vram_size, 0xFFFFFFFF);