The same thing Nicolai said: This can be committed before the UE4 compile failure is fixed.
Marek On Fri, Apr 15, 2016 at 2:10 AM, Edward O'Callaghan <[email protected]> wrote: > This is the last necessary bit for OpenGL 4.3 support. All driver-specific > functionality has already been implemented as part of extensions. > > Signed-off-by: Edward O'Callaghan <[email protected]> > --- > docs/GL3.txt | 2 +- > docs/relnotes/11.3.0.html | 8 ++++---- > src/gallium/drivers/radeonsi/si_pipe.c | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/docs/GL3.txt b/docs/GL3.txt > index 6b5e016..53aeb9e 100644 > --- a/docs/GL3.txt > +++ b/docs/GL3.txt > @@ -162,7 +162,7 @@ GL 4.2, GLSL 4.20 -- all DONE: radeonsi > GL_ARB_map_buffer_alignment DONE (all drivers) > > > -GL 4.3, GLSL 4.30: > +GL 4.3, GLSL 4.30 -- all DONE: radeonsi > > GL_ARB_arrays_of_arrays DONE (all drivers > that support GLSL 1.30) > GL_ARB_ES3_compatibility DONE (all drivers > that support GLSL 3.30) > diff --git a/docs/relnotes/11.3.0.html b/docs/relnotes/11.3.0.html > index 5a7083c..0bbd756 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.2 API, but the version reported by > +Mesa 11.3.0 implements the OpenGL 4.3 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.2. OpenGL > -4.2 is <strong>only</strong> available if requested at context creation > +Some drivers don't support all the features required in OpenGL 4.3. OpenGL > +4.3 is <strong>only</strong> available if requested at context creation > because compatibility contexts are not supported. > </p> > > @@ -44,7 +44,7 @@ Note: some of the new features are only available with > certain drivers. > </p> > > <ul> > -<li>OpenGL 4.2 on radeonsi</li> > +<li>OpenGL 4.3 on radeonsi</li> > <li>GL_ARB_compute_shader on radeonsi</li> > <li>GL_ARB_framebuffer_no_attachments on nvc0, r600, radeonsi, softpipe</li> > <li>GL_ARB_internalformat_query2 on all drivers</li> > diff --git a/src/gallium/drivers/radeonsi/si_pipe.c > b/src/gallium/drivers/radeonsi/si_pipe.c > index 94bd666..b789d4c 100644 > --- a/src/gallium/drivers/radeonsi/si_pipe.c > +++ b/src/gallium/drivers/radeonsi/si_pipe.c > @@ -338,7 +338,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum > pipe_cap param) > return HAVE_LLVM >= 0x0309 ? 4 : 0; > > case PIPE_CAP_GLSL_FEATURE_LEVEL: > - return HAVE_LLVM >= 0x0309 ? 420 : > + return HAVE_LLVM >= 0x0309 ? 430 : > HAVE_LLVM >= 0x0307 ? 410 : 330; > > case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE: > -- > 2.5.5 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
