Mesa (master): mesa/es3: Allow unsized depth and depth-stencil formats in ES3

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 1c29d8f4ffd562bc6abc2b3c37895d8db43feb95
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c29d8f4ffd562bc6abc2b3c37895d8db43feb95

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Jan 18 15:43:38 2013 -0800

mesa/es3: Allow unsized depth and depth-stencil formats in ES3

They're part of GL_OES_depth_texture_cube_map, and we'll always enable
that extension in ES3 contexts.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/main/glformats.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 3004c08..e4f7841 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -2069,12 +2069,14 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
    case GL_DEPTH_COMPONENT:
       switch (type) {
       case GL_UNSIGNED_SHORT:
-         if (internalFormat != GL_DEPTH_COMPONENT16)
+         if (internalFormat != GL_DEPTH_COMPONENT
+             && internalFormat != GL_DEPTH_COMPONENT16)
             return GL_INVALID_OPERATION;
          break;
 
       case GL_UNSIGNED_INT:
          switch (internalFormat) {
+         case GL_DEPTH_COMPONENT:
          case GL_DEPTH_COMPONENT16:
          case GL_DEPTH_COMPONENT24:
             break;
@@ -2096,7 +2098,8 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
    case GL_DEPTH_STENCIL:
       switch (type) {
       case GL_UNSIGNED_INT_24_8:
-         if (internalFormat != GL_DEPTH24_STENCIL8)
+         if (internalFormat != GL_DEPTH_STENCIL
+             && internalFormat != GL_DEPTH24_STENCIL8)
             return GL_INVALID_OPERATION;
          break;