Skip to content

S
swiftshader
Commit 3e02f68f by Alexis Hetu Committed by Alexis Hétu
Options

Increased the number of color attachments enums supported

Since the new headers have been committed, a larger amount of color attachments enums can be supported. Added the new enums where appropriate. Change-Id: Idd7210fbeaeb7828ca6c094bed115addd90b497c Reviewed-on: https://swiftshader-review.googlesource.com/4332Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 3412d870
Showing with 129 additions and 1 deletion
src/OpenGL/libGLESv2/libGLESv2.cpp
...@@ -2153,6 +2153,22 @@ void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuff ...@@ -2153,6 +2153,22 @@ void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuff
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
if(clientVersion < 3) if(clientVersion < 3)
{ {
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
...@@ -2288,6 +2304,22 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL ...@@ -2288,6 +2304,22 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
if(clientVersion < 3) if(clientVersion < 3)
{ {
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
...@@ -2936,6 +2968,22 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu ...@@ -2936,6 +2968,22 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
if(clientVersion < 3) if(clientVersion < 3)
{ {
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
...@@ -7317,6 +7365,22 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, ...@@ -7317,6 +7365,22 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget,
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
if(clientVersion < 3) if(clientVersion < 3)
{ {
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
......
src/OpenGL/libGLESv2/libGLESv3.cpp
...@@ -623,6 +623,22 @@ GL_APICALL void GL_APIENTRY glReadBuffer(GLenum src) ...@@ -623,6 +623,22 @@ GL_APICALL void GL_APIENTRY glReadBuffer(GLenum src)
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
{ {
GLuint index = (src - GL_COLOR_ATTACHMENT0); GLuint index = (src - GL_COLOR_ATTACHMENT0);
if(index >= es2::IMPLEMENTATION_MAX_COLOR_ATTACHMENTS) if(index >= es2::IMPLEMENTATION_MAX_COLOR_ATTACHMENTS)
...@@ -1239,6 +1255,22 @@ GL_APICALL void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs) ...@@ -1239,6 +1255,22 @@ GL_APICALL void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs)
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
{ {
GLuint index = (bufs[i] - GL_COLOR_ATTACHMENT0); GLuint index = (bufs[i] - GL_COLOR_ATTACHMENT0);
if(index >= es2::IMPLEMENTATION_MAX_COLOR_ATTACHMENTS) if(index >= es2::IMPLEMENTATION_MAX_COLOR_ATTACHMENTS)
...@@ -1660,6 +1692,22 @@ GL_APICALL void GL_APIENTRY glFramebufferTextureLayer(GLenum target, GLenum atta ...@@ -1660,6 +1692,22 @@ GL_APICALL void GL_APIENTRY glFramebufferTextureLayer(GLenum target, GLenum atta
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
if(!framebuffer || framebuffer->getColorbufferName(attachment - GL_COLOR_ATTACHMENT0) == 0) if(!framebuffer || framebuffer->getColorbufferName(attachment - GL_COLOR_ATTACHMENT0) == 0)
{ {
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
...@@ -3824,7 +3872,7 @@ GL_APICALL void GL_APIENTRY glInvalidateSubFramebuffer(GLenum target, GLsizei nu ...@@ -3824,7 +3872,7 @@ GL_APICALL void GL_APIENTRY glInvalidateSubFramebuffer(GLenum target, GLsizei nu
break; break;
default: default:
if(attachments[i] >= GL_COLOR_ATTACHMENT0 && if(attachments[i] >= GL_COLOR_ATTACHMENT0 &&
attachments[i] <= GL_COLOR_ATTACHMENT15) attachments[i] <= GL_COLOR_ATTACHMENT31)
{ {
if(attachments[i] - GL_COLOR_ATTACHMENT0 >= MAX_DRAW_BUFFERS) if(attachments[i] - GL_COLOR_ATTACHMENT0 >= MAX_DRAW_BUFFERS)
{ {
......
src/OpenGL/libGLESv2/utilities.cpp
...@@ -1352,6 +1352,22 @@ namespace sw2es ...@@ -1352,6 +1352,22 @@ namespace sw2es
case GL_COLOR_ATTACHMENT13: case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14: case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15: case GL_COLOR_ATTACHMENT15:
case GL_COLOR_ATTACHMENT16:
case GL_COLOR_ATTACHMENT17:
case GL_COLOR_ATTACHMENT18:
case GL_COLOR_ATTACHMENT19:
case GL_COLOR_ATTACHMENT20:
case GL_COLOR_ATTACHMENT21:
case GL_COLOR_ATTACHMENT22:
case GL_COLOR_ATTACHMENT23:
case GL_COLOR_ATTACHMENT24:
case GL_COLOR_ATTACHMENT25:
case GL_COLOR_ATTACHMENT26:
case GL_COLOR_ATTACHMENT27:
case GL_COLOR_ATTACHMENT28:
case GL_COLOR_ATTACHMENT29:
case GL_COLOR_ATTACHMENT30:
case GL_COLOR_ATTACHMENT31:
switch(format) switch(format)
{ {
case sw::FORMAT_R8I: case sw::FORMAT_R8I:
......
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