Browse Source

doc: fix GL extension link.

pull/225/head
Vladimír Vondruš 8 years ago
parent
commit
ac3bdeea06
  1. 2
      doc/opengl-support.dox
  2. 15
      src/Magnum/AbstractShaderProgram.h

2
doc/opengl-support.dox

@ -387,7 +387,7 @@ Extension | Status
@extension2{EXT,multi_draw_arrays,multi_draw_arrays} | done @extension2{EXT,multi_draw_arrays,multi_draw_arrays} | done
@extension{EXT,debug_label} | see above @extension{EXT,debug_label} | see above
@extension{EXT,debug_marker} | done @extension{EXT,debug_marker} | done
@extension{EXT,separate_shader_objects} | only direct uniform binding @extension2{EXT,separate_shader_objects,separate_shader_objects.gles} | only direct uniform binding
@extension{EXT,multisampled_render_to_texture} | only renderbuffer storage @extension{EXT,multisampled_render_to_texture} | only renderbuffer storage
@extension{EXT,robustness} | done @extension{EXT,robustness} | done
@extension{EXT,shader_framebuffer_fetch} | missing limit query @extension{EXT,shader_framebuffer_fetch} | missing limit query

15
src/Magnum/AbstractShaderProgram.h

@ -205,8 +205,8 @@ bindFragmentDataLocationIndexed(NormalOutput, 1, "normal");
1.0, similar functionality is available in extension 1.0, similar functionality is available in extension
@webgl_extension{WEBGL,draw_buffers}. @webgl_extension{WEBGL,draw_buffers}.
@todo @extension{EXT,separate_shader_objects} supports explicit attrib @todo @extension2{EXT,separate_shader_objects,separate_shader_objects.gles}
location supports explicit attrib location
@anchor AbstractShaderProgram-uniform-location @anchor AbstractShaderProgram-uniform-location
### Uniform locations ### Uniform locations
@ -467,10 +467,10 @@ cached, so repeated queries don't result in repeated @fn_gl{Get} calls. See
also @ref Context::resetState() and @ref Context::State::Shaders. also @ref Context::resetState() and @ref Context::State::Shaders.
If extension @extension{ARB,separate_shader_objects} (part of OpenGL 4.1), If extension @extension{ARB,separate_shader_objects} (part of OpenGL 4.1),
@extension{EXT,direct_state_access} desktop extension, @extension{EXT,separate_shader_objects} @extension{EXT,direct_state_access} desktop extension, @extension2{EXT,separate_shader_objects,separate_shader_objects.gles} OpenGL ES
OpenGL ES extension or OpenGL ES 3.1 is available, uniform setting functions extension or OpenGL ES 3.1 is available, uniform setting functions use DSA
use DSA functions to avoid unnecessary calls to @fn_gl{UseProgram}. See functions to avoid unnecessary calls to @fn_gl{UseProgram}. See @ref setUniform()
@ref setUniform() documentation for more information. documentation for more information.
To achieve least state changes, set all uniforms in one run -- method chaining To achieve least state changes, set all uniforms in one run -- method chaining
comes in handy. comes in handy.
@ -845,7 +845,8 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
* Initially disabled. * Initially disabled.
* @see @fn_gl{ProgramParameter} with @def_gl{PROGRAM_SEPARABLE} * @see @fn_gl{ProgramParameter} with @def_gl{PROGRAM_SEPARABLE}
* @requires_gl41 Extension @extension{ARB,separate_shader_objects} * @requires_gl41 Extension @extension{ARB,separate_shader_objects}
* @requires_es_extension Extension @extension{EXT,separate_shader_objects} * @requires_es_extension Extension
* @extension2{EXT,separate_shader_objects,separate_shader_objects.gles}
* @requires_gles Separate shader objects are not supported in WebGL. * @requires_gles Separate shader objects are not supported in WebGL.
*/ */
void setSeparable(bool enabled) { void setSeparable(bool enabled) {

Loading…
Cancel
Save