diff --git a/gl2/glLinkProgram.xhtml b/gl2/glLinkProgram.xhtml index 71cf64bc..52d4a11d 100644 --- a/gl2/glLinkProgram.xhtml +++ b/gl2/glLinkProgram.xhtml @@ -26,7 +26,7 @@ one at this time.
Linking of a program object can fail for a number of reasons as specified in the OpenGL Shading Language Specification. The following lists some of the - conditions that will cause a link error.
The number of active attribute variables supported + conditions that will cause a link error.
The number of active attribute variables supported by the implementation has been exceeded.
The storage limit for uniform variables has been exceeded.
The number of active uniform variables supported by the implementation has been exceeded.
The main
function is missing
diff --git a/gl2/glUseProgram.xhtml b/gl2/glUseProgram.xhtml
index 9f0e001b..36c1b94a 100644
--- a/gl2/glUseProgram.xhtml
+++ b/gl2/glUseProgram.xhtml
@@ -21,7 +21,7 @@
processor will cause the corresponding fixed functionality of
OpenGL to be disabled. Specifically, if an executable is
installed on the vertex processor, the OpenGL fixed
- functionality will be disabled as follows.
The modelview matrix is not applied to vertex + functionality will be disabled as follows.
The modelview matrix is not applied to vertex coordinates.
The projection matrix is not applied to vertex coordinates.
The texture matrices are not applied to texture coordinates.
Normals are not transformed to eye @@ -34,7 +34,7 @@ is expected to implement any or all of the desired functionality from the preceding list. Similarly, if an executable is installed on the fragment processor, the OpenGL fixed - functionality will be disabled as follows.
Texture environment and texture functions are not + functionality will be disabled as follows.
Texture environment and texture functions are not applied.
Texture application is not applied.
Color sum is not applied.
Fog is not applied.
Again, the fragment shader that is installed is expected to implement any or all of the desired functionality from the preceding list.
While a program object is in use, applications are free to diff --git a/gl2/glValidateProgram.xhtml b/gl2/glValidateProgram.xhtml index 179e56c9..dd7fd6c9 100644 --- a/gl2/glValidateProgram.xhtml +++ b/gl2/glValidateProgram.xhtml @@ -33,7 +33,7 @@ glRasterPos, or any command that performs an implicit call to glBegin - if:
any two active samplers in the current program + if:
any two active samplers in the current program object are of different types, but refer to the same texture image unit,
any active sampler in the current program object refers to a texture image unit where fixed-function diff --git a/gl3/glLinkProgram.xhtml b/gl3/glLinkProgram.xhtml index 3e823eaf..2fc8d367 100644 --- a/gl3/glLinkProgram.xhtml +++ b/gl3/glLinkProgram.xhtml @@ -29,7 +29,7 @@ one at this time.
Linking of a program object can fail for a number of reasons as specified in the OpenGL Shading Language Specification. The following lists some of the - conditions that will cause a link error.
The number of active attribute variables supported + conditions that will cause a link error.
The number of active attribute variables supported by the implementation has been exceeded.
The storage limit for uniform variables has been exceeded.
The number of active uniform variables supported by the implementation has been exceeded.
The main
function is missing
diff --git a/gl3/glValidateProgram.xhtml b/gl3/glValidateProgram.xhtml
index aca6435e..86a1c471 100644
--- a/gl3/glValidateProgram.xhtml
+++ b/gl3/glValidateProgram.xhtml
@@ -28,7 +28,7 @@
implementations must perform when rendering commands are issued
while programmable shaders are part of current state. The error
GL_INVALID_OPERATION
will be generated by
- any command that triggers the rendering of geometry if:
any two active samplers in the current program + any command that triggers the rendering of geometry if:
any two active samplers in the current program object are of different types, but refer to the same texture image unit,
the number of active samplers in the program exceeds the maximum number of texture image units allowed.
It may be difficult or cause a performance degradation for diff --git a/html/copy/style.css b/html/copy/style.css index 607e5834..7bd383ee 100644 --- a/html/copy/style.css +++ b/html/copy/style.css @@ -325,6 +325,11 @@ a { border: 1px solid; } +.itemizedlist ul { + list-style-type: disc; + padding-left: 1em; +} + .example .programlisting { overflow-x: scroll; padding: 10px;