Refresh lighting and culling uniforms if the camera changes in pop_state

[libs/gl.git] / source / pixelformat.cpp

diff --git a/source/pixelformat.cpp b/source/pixelformat.cpp
index ac2b1ea73dfde7818fab470b45565e1c5f5e32a2..d866bcf8094b9f9d677ccea8c00bf36db8842cd7 100644 (file)
--- a/source/pixelformat.cpp
+++ b/source/pixelformat.cpp
@@ -77,6 +77,19 @@ PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat pf, bool srg
 }
 
 PixelFormat get_base_pixelformat(PixelFormat pf)
+{
+       PixelFormat unsized = get_unsized_pixelformat(pf);
+       switch(unsized)
+       {
+       case SRGB: return RGB;
+       case SRGB_ALPHA: return RGBA;
+       case SLUMINANCE: return LUMINANCE;
+       case SLUMINANCE_ALPHA: return LUMINANCE_ALPHA;
+       default: return unsized;
+       }
+}
+
+PixelFormat get_unsized_pixelformat(PixelFormat pf)
 {
        switch(pf)
        {
@@ -88,20 +101,16 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
        case RG32F: return RG;
        case RGB8:
        case RGB16F:
-       case RGB32F:
-       case SRGB:
-       case SRGB8: return RGB;
+       case RGB32F: return RGB;
+       case SRGB8: return SRGB;
        case RGBA8:
        case RGBA16F:
-       case RGBA32F:
-       case SRGB_ALPHA:
-       case SRGB8_ALPHA8: return RGBA;
-       case LUMINANCE8:
-       case SLUMINANCE:
-       case SLUMINANCE8: return LUMINANCE;
-       case LUMINANCE_ALPHA8:
-       case SLUMINANCE_ALPHA:
-       case SLUMINANCE8_ALPHA8: return LUMINANCE_ALPHA;
+       case RGBA32F: return RGBA;
+       case SRGB8_ALPHA8: return SRGB_ALPHA;
+       case LUMINANCE8: return LUMINANCE;
+       case SLUMINANCE8: return SLUMINANCE;
+       case LUMINANCE_ALPHA8: return LUMINANCE_ALPHA;
+       case SLUMINANCE8_ALPHA8: return SLUMINANCE_ALPHA;
        case DEPTH_COMPONENT16:
        case DEPTH_COMPONENT24:
        case DEPTH_COMPONENT32: return DEPTH_COMPONENT;
@@ -109,26 +118,64 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
        }
 }
 
-PixelFormat get_sized_pixelformat(PixelFormat pf)
+PixelFormat get_sized_pixelformat(PixelFormat pf, unsigned size)
 {
+       if(!size || size>4)
+               throw invalid_argument("get_sized_pixelformat");
+
        switch(pf)
        {
-       case RED: return R8;
-       case RG: return RG8;
-       case RGB: return RGB8;
-       case RGBA: return RGBA8;
-       case SRGB: return SRGB8;
-       case SRGB_ALPHA: return SRGB8_ALPHA8;
-       case LUMINANCE: return LUMINANCE8;
-       case SLUMINANCE: return SLUMINANCE8;
-       case LUMINANCE_ALPHA: return LUMINANCE8_ALPHA8;
-       case SLUMINANCE_ALPHA: return SLUMINANCE8_ALPHA8;
-       case DEPTH_COMPONENT:
-               if(get_gl_api()==OPENGL_ES2)
-                       return DEPTH_COMPONENT16;
+       case SRGB:
+       case SRGB_ALPHA: break;
+       case SRGB8: pf = SRGB; break;
+       case SRGB8_ALPHA8: pf = SRGB_ALPHA; break;
+       default: pf = get_base_pixelformat(pf);
+       }
+
+       switch(size)
+       {
+       case 1:
+               switch(pf)
+               {
+               case RED: return R8;
+               case RG: return RG8;
+               case RGB: return RGB8;
+               case RGBA: return RGBA8;
+               case SRGB: return SRGB8;
+               case SRGB_ALPHA: return SRGB8_ALPHA8;
+               case LUMINANCE: return LUMINANCE8;
+               case SLUMINANCE: return SLUMINANCE8;
+               case LUMINANCE_ALPHA: return LUMINANCE8_ALPHA8;
+               case SLUMINANCE_ALPHA: return SLUMINANCE8_ALPHA8;
+               default: throw invalid_argument("get_sized_pixelformat");
+               }
+       case 2:
+               switch(pf)
+               {
+               case RED: return R16F;
+               case RG: return RG16F;
+               case RGB: return RGB16F;
+               case RGBA: return RGBA16F;
+               case DEPTH_COMPONENT: return DEPTH_COMPONENT16;
+               default: throw invalid_argument("get_sized_pixelformat");
+               }
+       case 3:
+               if(pf==DEPTH_COMPONENT)
+                       return DEPTH_COMPONENT24;
                else
-                       return DEPTH_COMPONENT32;
-       default: return pf;
+                       throw invalid_argument("get_sized_pixelformat");
+       case 4:
+               switch(pf)
+               {
+               case RED: return R32F;
+               case RG: return RG32F;
+               case RGB: return RGB32F;
+               case RGBA: return RGBA32F;
+               case DEPTH_COMPONENT: return DEPTH_COMPONENT32;
+               default: throw invalid_argument("get_sized_pixelformat");
+               }
+       default:
+               throw invalid_argument("get_sized_pixelformat");
        }
 }
 
@@ -177,6 +224,17 @@ unsigned get_component_size(PixelFormat pf)
 {
        switch(pf)
        {
+       case R8:
+       case RG8:
+       case RGB8:
+       case RGBA8:
+       case SRGB8:
+       case SRGB8_ALPHA8:
+       case LUMINANCE8:
+       case LUMINANCE8_ALPHA8:
+       case SLUMINANCE8:
+       case SLUMINANCE8_ALPHA8:
+               return 1;
        case R16F:
        case RG16F:
        case RGB16F:
@@ -192,13 +250,13 @@ unsigned get_component_size(PixelFormat pf)
        case DEPTH_COMPONENT32:
                return 4;
        default:
-               return 1;
+               return 0;
        }
 }
 
 unsigned get_pixel_size(PixelFormat pf)
 {
-       return get_component_count(pf)*get_component_size(pf);
+       return get_component_count(pf)*max(get_component_size(pf), 1U);
 }
 
 void require_pixelformat(PixelFormat pf)