Commit c41bb9a2 by kbr@chromium.org

Fixed issues pointed out by gman; removed references to GetDoublev and

ReadBuffer, which don't exist in either OpenGL ES 2.0 or 3.0. Review URL: https://codereview.appspot.com/6681043 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1291 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 60354ec6
...@@ -60,8 +60,7 @@ New Tokens ...@@ -60,8 +60,7 @@ New Tokens
MAX_COLOR_ATTACHMENTS_ANGLE 0x8CDF MAX_COLOR_ATTACHMENTS_ANGLE 0x8CDF
Accepted by the <pname> parameters of GetIntegerv, GetFloatv, Accepted by the <pname> parameters of GetIntegerv and GetFloatv:
and GetDoublev:
MAX_DRAW_BUFFERS_ANGLE 0x8824 MAX_DRAW_BUFFERS_ANGLE 0x8824
DRAW_BUFFER0_ANGLE 0x8825 DRAW_BUFFER0_ANGLE 0x8825
...@@ -147,8 +146,8 @@ Changes to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment ...@@ -147,8 +146,8 @@ Changes to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
Operations and the Frame Buffer) Operations and the Frame Buffer)
Insert Table 4.3 (and renumber subsequent tables): Arguments to Insert Table 4.3 (and renumber subsequent tables): Arguments to
DrawBuffers and ReadBuffer when the context is bound to a DrawBuffersANGLE when the context is bound to a framebuffer
framebuffer object, and the buffers they indicate. <i> in object, and the buffers they indicate. <i> in
COLOR_ATTACHMENT<i>_ANGLE may range from zero to the value of COLOR_ATTACHMENT<i>_ANGLE may range from zero to the value of
MAX_COLOR_ATTACHMENTS_ANGLE minus one. MAX_COLOR_ATTACHMENTS_ANGLE minus one.
...@@ -167,7 +166,7 @@ Operations and the Frame Buffer) ...@@ -167,7 +166,7 @@ Operations and the Frame Buffer)
single buffered surfaces or into the back buffer for back buffered single buffered surfaces or into the back buffer for back buffered
surfaces as determined when making the context current. To control surfaces as determined when making the context current. To control
the color buffer into which each of the fragment color values is the color buffer into which each of the fragment color values is
written, DrawBuffers is used. written, DrawBuffersANGLE is used.
The command The command
...@@ -222,20 +221,21 @@ Operations and the Frame Buffer) ...@@ -222,20 +221,21 @@ Operations and the Frame Buffer)
is NONE and any buffer at a higher index is anything other than is NONE and any buffer at a higher index is anything other than
NONE, DrawBuffersANGLE will generate the error INVALID_OPERATION. NONE, DrawBuffersANGLE will generate the error INVALID_OPERATION.
If a fragment shader writes to "gl_FragColor", DrawBuffers specifies If a fragment shader writes to "gl_FragColor", DrawBuffersANGLE
a set of draw buffers into which the color written to "gl_FragColor" specifies a set of draw buffers into which the color written to
is written. If a fragment shader writes to "gl_FragData", "gl_FragColor" is written. If a fragment shader writes to
DrawBuffers specifies a set of draw buffers into which each of the "gl_FragData", DrawBuffersANGLE specifies a set of draw buffers
multiple output colors defined by these variables are separately into which each of the multiple output colors defined by these
written. If a fragment shader writes to neither "gl_FragColor" nor variables are separately written. If a fragment shader writes to
"gl_FragData" the values of the fragment colors following shader neither "gl_FragColor" nor "gl_FragData" the values of the
execution are undefined, and may differ for each fragment color. fragment colors following shader execution are undefined, and may
differ for each fragment color.
Indicating a buffer or buffers using DrawBuffers causes subsequent
pixel color value writes to affect the indicated buffers. If the GL Indicating a buffer or buffers using DrawBuffersANGLE causes
is bound to a framebuffer object and a draw buffer selects an subsequent pixel color value writes to affect the indicated
attachment that has no image attached, then that fragment color is buffers. If the GL is bound to a framebuffer object and a draw
not written to any buffer. buffer selects an attachment that has no image attached, then that
fragment color is not written to any buffer.
Specifying NONE as the draw buffer for a fragment color will inhibit Specifying NONE as the draw buffer for a fragment color will inhibit
that fragment color from being written to any buffer. that fragment color from being written to any buffer.
......
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1289 #define BUILD_REVISION 1291
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment