Skip to content

Commit

Permalink
Get 4.5.1.0 ready
Browse files Browse the repository at this point in the history
  • Loading branch information
Christophe Riccio committed Mar 28, 2015
1 parent da39386 commit 189b7b9
Show file tree
Hide file tree
Showing 17 changed files with 187 additions and 190 deletions.
2 changes: 1 addition & 1 deletion data/gl-500/multi-draw-indirect-count.vert
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

precision highp float;
precision highp int;
//layout(std140, column_major) uniform;
layout(std140, column_major) uniform;
layout(std430, column_major) buffer;

layout(binding = INDIRECTION) uniform indirection
Expand Down
4 changes: 2 additions & 2 deletions external/gli-0.6.0.A/gli/core/fetch.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ namespace gli
template <typename genType>
genType texelFetch(
texture2D const & Texture,
texture2D::dim_type const & TexelCoord,
texture2D::dim_type const & Texcoord,
texture2D::size_type const & Level);

template <typename genType>
void texelWrite(
texture2D & Texture,
texture2D::dim_type const & TexelCoord,
texture2D::dim_type const & Texcoord,
texture2D::size_type const & Level,
genType const & Color);

Expand Down
205 changes: 103 additions & 102 deletions external/gli-0.6.0.A/gli/core/load_dds.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,108 +194,109 @@ namespace detail

inline gli::format format_dds2gli_cast(dxgiFormat const & Format)
{
static gli::format const Cast[] =
static gli::format const Cast[] =
{
gli::FORMAT_INVALID, //DXGI_FORMAT_UNKNOWN = 0,
gli::RGBA32U, //DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
gli::RGBA32F, //DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
gli::RGBA32U, //DXGI_FORMAT_R32G32B32A32_UINT = 3,
gli::RGBA32I, //DXGI_FORMAT_R32G32B32A32_SINT = 4,
gli::RGB32U, //DXGI_FORMAT_R32G32B32_TYPELESS = 5,
gli::RGB32F, //DXGI_FORMAT_R32G32B32_FLOAT = 6,
gli::RGB32U, //DXGI_FORMAT_R32G32B32_UINT = 7,
gli::RGB32I, //DXGI_FORMAT_R32G32B32_SINT = 8,
gli::RGBA16U, //DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
gli::RGBA16F, //DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
gli::RGBA16_UNORM, //DXGI_FORMAT_R16G16B16A16_UNORM = 11,
gli::RGBA16I, //DXGI_FORMAT_R16G16B16A16_UINT = 12,
gli::RGBA16_SNORM, //DXGI_FORMAT_R16G16B16A16_SNORM = 13,
gli::RGBA16I, //DXGI_FORMAT_R16G16B16A16_SINT = 14,
gli::RG32U, //DXGI_FORMAT_R32G32_TYPELESS = 15,
gli::RG32F, //DXGI_FORMAT_R32G32_FLOAT = 16,
gli::RG32U, //DXGI_FORMAT_R32G32_UINT = 17,
gli::RG32I, //DXGI_FORMAT_R32G32_SINT = 18,
gli::FORMAT_INVALID, //DXGI_FORMAT_R32G8X24_TYPELESS = 19,
gli::D32FS8X24, //DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
gli::FORMAT_INVALID, //DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
gli::FORMAT_INVALID, //DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
gli::RGB10A2U, //DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
gli::RGB10A2_UNORM, //DXGI_FORMAT_R10G10B10A2_UNORM = 24,
gli::RGB10A2U, //DXGI_FORMAT_R10G10B10A2_UINT = 25,
gli::RG11B10F, //DXGI_FORMAT_R11G11B10_FLOAT = 26,
gli::RGBA8U, //DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
gli::RGBA8_UNORM, //DXGI_FORMAT_R8G8B8A8_UNORM = 28,
gli::SRGB8_ALPHA8, //DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
gli::RGBA8U, //DXGI_FORMAT_R8G8B8A8_UINT = 30,
gli::RGBA8_SNORM, //DXGI_FORMAT_R8G8B8A8_SNORM = 31,
gli::RGBA8I, //DXGI_FORMAT_R8G8B8A8_SINT = 32,
gli::RG16U, //DXGI_FORMAT_R16G16_TYPELESS = 33,
gli::RG16F, //DXGI_FORMAT_R16G16_FLOAT = 34,
gli::RG16_UNORM, //DXGI_FORMAT_R16G16_UNORM = 35,
gli::RG16U, //DXGI_FORMAT_R16G16_UINT = 36,
gli::RG16_SNORM, //DXGI_FORMAT_R16G16_SNORM = 37,
gli::RG16I, //DXGI_FORMAT_R16G16_SINT = 38,
gli::R32F, //DXGI_FORMAT_R32_TYPELESS = 39,
gli::D32F, //DXGI_FORMAT_D32_FLOAT = 40,
gli::R32F, //DXGI_FORMAT_R32_FLOAT = 41,
gli::R32U, //DXGI_FORMAT_R32_UINT = 42,
gli::R32I, //DXGI_FORMAT_R32_SINT = 43,
gli::FORMAT_INVALID, //DXGI_FORMAT_R24G8_TYPELESS = 44,
gli::FORMAT_INVALID, //DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
gli::FORMAT_INVALID, //DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
gli::FORMAT_INVALID, //DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
gli::RG8U, //DXGI_FORMAT_R8G8_TYPELESS = 48,
gli::RG8_UNORM, //DXGI_FORMAT_R8G8_UNORM = 49,
gli::RG8U, //DXGI_FORMAT_R8G8_UINT = 50,
gli::RG8_SNORM, //DXGI_FORMAT_R8G8_SNORM = 51,
gli::RG8I, //DXGI_FORMAT_R8G8_SINT = 52,
gli::R16U, //DXGI_FORMAT_R16_TYPELESS = 53,
gli::R16F, //DXGI_FORMAT_R16_FLOAT = 54,
gli::D16, //DXGI_FORMAT_D16_UNORM = 55,
gli::R16_UNORM, //DXGI_FORMAT_R16_UNORM = 56,
gli::R16U, //DXGI_FORMAT_R16_UINT = 57,
gli::R16_SNORM, //DXGI_FORMAT_R16_SNORM = 58,
gli::R16I, //DXGI_FORMAT_R16_SINT = 59,
gli::R8U, //DXGI_FORMAT_R8_TYPELESS = 60,
gli::R8_UNORM, //DXGI_FORMAT_R8_UNORM = 61,
gli::R8U, //DXGI_FORMAT_R8_UINT = 62,
gli::R8_SNORM, //DXGI_FORMAT_R8_SNORM = 63,
gli::R8I, //DXGI_FORMAT_R8_SINT = 64,
gli::R8U, //DXGI_FORMAT_A8_UNORM = 65,
gli::FORMAT_INVALID, //DXGI_FORMAT_R1_UNORM = 66,
gli::RGB9E5, //DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
gli::FORMAT_INVALID, //DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
gli::FORMAT_INVALID, //DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
gli::RGBA_DXT1, //DXGI_FORMAT_BC1_TYPELESS = 70,
gli::RGBA_DXT1, //DXGI_FORMAT_BC1_UNORM = 71,
gli::SRGB_ALPHA_DXT1, //DXGI_FORMAT_BC1_UNORM_SRGB = 72,
gli::RGBA_DXT3, //DXGI_FORMAT_BC2_TYPELESS = 73,
gli::RGBA_DXT3, //DXGI_FORMAT_BC2_UNORM = 74,
gli::SRGB_ALPHA_DXT3, //DXGI_FORMAT_BC2_UNORM_SRGB = 75,
gli::RGBA_DXT5, //DXGI_FORMAT_BC3_TYPELESS = 76,
gli::RGBA_DXT5, //DXGI_FORMAT_BC3_UNORM = 77,
gli::SRGB_ALPHA_DXT5, //DXGI_FORMAT_BC3_UNORM_SRGB = 78,
gli::R_ATI1N_UNORM, //DXGI_FORMAT_BC4_TYPELESS = 79,
gli::R_ATI1N_UNORM, //DXGI_FORMAT_BC4_UNORM = 80,
gli::R_ATI1N_SNORM, //DXGI_FORMAT_BC4_SNORM = 81,
gli::RG_ATI2N_UNORM, //DXGI_FORMAT_BC5_TYPELESS = 82,
gli::RG_ATI2N_UNORM, //DXGI_FORMAT_BC5_UNORM = 83,
gli::RG_ATI2N_SNORM, //DXGI_FORMAT_BC5_SNORM = 84,
gli::FORMAT_INVALID, //DXGI_FORMAT_B5G6R5_UNORM = 85,
gli::FORMAT_INVALID, //DXGI_FORMAT_B5G5R5A1_UNORM = 86,
gli::FORMAT_INVALID, //DXGI_FORMAT_B8G8R8A8_UNORM = 87,
gli::FORMAT_INVALID, //DXGI_FORMAT_B8G8R8X8_UNORM = 88,
gli::FORMAT_INVALID, //DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
gli::FORMAT_INVALID, //DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
gli::FORMAT_INVALID, //DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
gli::FORMAT_INVALID, //DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
gli::FORMAT_INVALID, //DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
gli::RGB_BP_UNSIGNED_FLOAT, //DXGI_FORMAT_BC6H_TYPELESS = 94,
gli::RGB_BP_UNSIGNED_FLOAT, //DXGI_FORMAT_BC6H_UF16 = 95,
gli::RGB_BP_SIGNED_FLOAT, //DXGI_FORMAT_BC6H_SF16 = 96,
gli::RGB_BP_UNORM, //DXGI_FORMAT_BC7_TYPELESS = 97,
gli::RGB_BP_UNORM, //DXGI_FORMAT_BC7_UNORM = 98,
gli::SRGB_BP_UNORM, //DXGI_FORMAT_BC7_UNORM_SRGB = 99,
gli::FORMAT_INVALID, //DXGI_FORMAT_UNKNOWN = 0,
gli::RGBA32U, //DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
gli::RGBA32F, //DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
gli::RGBA32U, //DXGI_FORMAT_R32G32B32A32_UINT = 3,
gli::RGBA32I, //DXGI_FORMAT_R32G32B32A32_SINT = 4,
gli::RGB32U, //DXGI_FORMAT_R32G32B32_TYPELESS = 5,
gli::RGB32F, //DXGI_FORMAT_R32G32B32_FLOAT = 6,
gli::RGB32U, //DXGI_FORMAT_R32G32B32_UINT = 7,
gli::RGB32I, //DXGI_FORMAT_R32G32B32_SINT = 8,
gli::RGBA16U, //DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
gli::RGBA16F, //DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
gli::RGBA16_UNORM, //DXGI_FORMAT_R16G16B16A16_UNORM = 11,
gli::RGBA16I, //DXGI_FORMAT_R16G16B16A16_UINT = 12,
gli::RGBA16_SNORM, //DXGI_FORMAT_R16G16B16A16_SNORM = 13,
gli::RGBA16I, //DXGI_FORMAT_R16G16B16A16_SINT = 14,
gli::RG32U, //DXGI_FORMAT_R32G32_TYPELESS = 15,
gli::RG32F, //DXGI_FORMAT_R32G32_FLOAT = 16,
gli::RG32U, //DXGI_FORMAT_R32G32_UINT = 17,
gli::RG32I, //DXGI_FORMAT_R32G32_SINT = 18,
gli::FORMAT_INVALID, //DXGI_FORMAT_R32G8X24_TYPELESS = 19,
gli::D32FS8X24, //DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
gli::FORMAT_INVALID, //DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
gli::FORMAT_INVALID, //DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
gli::RGB10A2U, //DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
gli::RGB10A2_UNORM, //DXGI_FORMAT_R10G10B10A2_UNORM = 24,
gli::RGB10A2U, //DXGI_FORMAT_R10G10B10A2_UINT = 25,
gli::RG11B10F, //DXGI_FORMAT_R11G11B10_FLOAT = 26,
gli::RGBA8U, //DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
gli::RGBA8_UNORM, //DXGI_FORMAT_R8G8B8A8_UNORM = 28,
gli::SRGB8_ALPHA8, //DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
gli::RGBA8U, //DXGI_FORMAT_R8G8B8A8_UINT = 30,
gli::RGBA8_SNORM, //DXGI_FORMAT_R8G8B8A8_SNORM = 31,
gli::RGBA8I, //DXGI_FORMAT_R8G8B8A8_SINT = 32,
gli::RG16U, //DXGI_FORMAT_R16G16_TYPELESS = 33,
gli::RG16F, //DXGI_FORMAT_R16G16_FLOAT = 34,
gli::RG16_UNORM, //DXGI_FORMAT_R16G16_UNORM = 35,
gli::RG16U, //DXGI_FORMAT_R16G16_UINT = 36,
gli::RG16_SNORM, //DXGI_FORMAT_R16G16_SNORM = 37,
gli::RG16I, //DXGI_FORMAT_R16G16_SINT = 38,
gli::R32F, //DXGI_FORMAT_R32_TYPELESS = 39,
gli::D32F, //DXGI_FORMAT_D32_FLOAT = 40,
gli::R32F, //DXGI_FORMAT_R32_FLOAT = 41,
gli::R32U, //DXGI_FORMAT_R32_UINT = 42,
gli::R32I, //DXGI_FORMAT_R32_SINT = 43,
gli::FORMAT_INVALID, //DXGI_FORMAT_R24G8_TYPELESS = 44,
gli::FORMAT_INVALID, //DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
gli::FORMAT_INVALID, //DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
gli::FORMAT_INVALID, //DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
gli::RG8U, //DXGI_FORMAT_R8G8_TYPELESS = 48,
gli::RG8_UNORM, //DXGI_FORMAT_R8G8_UNORM = 49,
gli::RG8U, //DXGI_FORMAT_R8G8_UINT = 50,
gli::RG8_SNORM, //DXGI_FORMAT_R8G8_SNORM = 51,
gli::RG8I, //DXGI_FORMAT_R8G8_SINT = 52,
gli::R16U, //DXGI_FORMAT_R16_TYPELESS = 53,
gli::R16F, //DXGI_FORMAT_R16_FLOAT = 54,
gli::D16, //DXGI_FORMAT_D16_UNORM = 55,
gli::R16_UNORM, //DXGI_FORMAT_R16_UNORM = 56,
gli::R16U, //DXGI_FORMAT_R16_UINT = 57,
gli::R16_SNORM, //DXGI_FORMAT_R16_SNORM = 58,
gli::R16I, //DXGI_FORMAT_R16_SINT = 59,
gli::R8U, //DXGI_FORMAT_R8_TYPELESS = 60,
gli::R8_UNORM, //DXGI_FORMAT_R8_UNORM = 61,
gli::R8U, //DXGI_FORMAT_R8_UINT = 62,
gli::R8_SNORM, //DXGI_FORMAT_R8_SNORM = 63,
gli::R8I, //DXGI_FORMAT_R8_SINT = 64,
gli::R8U, //DXGI_FORMAT_A8_UNORM = 65,
gli::FORMAT_INVALID, //DXGI_FORMAT_R1_UNORM = 66,
gli::RGB9E5, //DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
gli::FORMAT_INVALID, //DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
gli::FORMAT_INVALID, //DXGI_FORMAT_G8R8_G8B8_UNORM = 69,

gli::RGBA_DXT1, //DXGI_FORMAT_BC1_TYPELESS = 70,
gli::RGBA_DXT1, //DXGI_FORMAT_BC1_UNORM = 71,
gli::SRGB_ALPHA_DXT1, //DXGI_FORMAT_BC1_UNORM_SRGB = 72,
gli::RGBA_DXT3, //DXGI_FORMAT_BC2_TYPELESS = 73,
gli::RGBA_DXT3, //DXGI_FORMAT_BC2_UNORM = 74,
gli::SRGB_ALPHA_DXT3, //DXGI_FORMAT_BC2_UNORM_SRGB = 75,
gli::RGBA_DXT5, //DXGI_FORMAT_BC3_TYPELESS = 76,
gli::RGBA_DXT5, //DXGI_FORMAT_BC3_UNORM = 77,
gli::SRGB_ALPHA_DXT5, //DXGI_FORMAT_BC3_UNORM_SRGB = 78,
gli::R_ATI1N_UNORM, //DXGI_FORMAT_BC4_TYPELESS = 79,
gli::R_ATI1N_UNORM, //DXGI_FORMAT_BC4_UNORM = 80,
gli::R_ATI1N_SNORM, //DXGI_FORMAT_BC4_SNORM = 81,
gli::RG_ATI2N_UNORM, //DXGI_FORMAT_BC5_TYPELESS = 82,
gli::RG_ATI2N_UNORM, //DXGI_FORMAT_BC5_UNORM = 83,
gli::RG_ATI2N_SNORM, //DXGI_FORMAT_BC5_SNORM = 84,
gli::FORMAT_INVALID, //DXGI_FORMAT_B5G6R5_UNORM = 85,
gli::FORMAT_INVALID, //DXGI_FORMAT_B5G5R5A1_UNORM = 86,
gli::RGBA8_UNORM, //DXGI_FORMAT_B8G8R8A8_UNORM = 87,
gli::RGB8_UNORM, //DXGI_FORMAT_B8G8R8X8_UNORM = 88,
gli::FORMAT_INVALID, //DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
gli::RGBA8_UNORM, //DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
gli::SRGB8_ALPHA8, //DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
gli::RGB8_UNORM, //DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
gli::SRGB8, //DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
gli::RGB_BP_UNSIGNED_FLOAT, //DXGI_FORMAT_BC6H_TYPELESS = 94,
gli::RGB_BP_UNSIGNED_FLOAT, //DXGI_FORMAT_BC6H_UF16 = 95,
gli::RGB_BP_SIGNED_FLOAT, //DXGI_FORMAT_BC6H_SF16 = 96,
gli::RGB_BP_UNORM, //DXGI_FORMAT_BC7_TYPELESS = 97,
gli::RGB_BP_UNORM, //DXGI_FORMAT_BC7_UNORM = 98,
gli::SRGB_BP_UNORM, //DXGI_FORMAT_BC7_UNORM_SRGB = 99,
gli::FORMAT_INVALID, //DXGI_FORMAT_AYUV = 100,
gli::FORMAT_INVALID, //DXGI_FORMAT_Y410 = 101,
gli::FORMAT_INVALID, //DXGI_FORMAT_Y416 = 102,
Expand All @@ -312,7 +313,7 @@ namespace detail
gli::FORMAT_INVALID, //DXGI_FORMAT_P8 = 113,
gli::FORMAT_INVALID, //DXGI_FORMAT_A8P8 = 114,
gli::FORMAT_INVALID, //DXGI_FORMAT_B4G4R4A4_UNORM = 115,
gli::R32U //DXGI_FORMAT_FORCE_UINT = 0xffffffffUL
gli::R32U //DXGI_FORMAT_FORCE_UINT = 0xffffffffUL
};

assert(Format > DXGI_FORMAT_UNKNOWN && Format < DXGI_FORMAT_LAST);
Expand Down
11 changes: 6 additions & 5 deletions tests/es-300-fbo-srgb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,15 @@ class es_300_fbo_srgb : public test
return false;

glBindFramebuffer(GL_FRAMEBUFFER, 0);
return true;

/*

GLint const SRGB = GL_SRGB;
GLint const Linear = GL_LINEAR;
GLint Encoding = 0;
glGetFramebufferAttachmentParameteriv(GL_DRAW_FRAMEBUFFER, GL_BACK_LEFT, GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, &Encoding);
if (Encoding != GL_SRGB)
return false;
*/
//if (Encoding != GL_SRGB)

return true;
}

bool begin()
Expand Down
9 changes: 5 additions & 4 deletions tests/gl-320-fbo-srgb-blend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,10 @@ class gl_320_fbo_srgb_blend : public test
{
bool Validated(true);

// Explicitly convert linear pixel color to sRGB color space, as FramebufferName is a sRGB FBO
// Shader execution is done with linear color to get correct linear algebra working.
glEnable(GL_FRAMEBUFFER_SRGB);

if(Validated)
Validated = initProgram();
if(Validated)
Expand Down Expand Up @@ -342,9 +346,7 @@ class gl_320_fbo_srgb_blend : public test
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

glBindFramebuffer(GL_FRAMEBUFFER, FramebufferName);
// Explicitly convert linear pixel color to sRGB color space, as FramebufferName is a sRGB FBO
// Shader execution is done with linear color to get correct linear algebra working.
glEnable(GL_FRAMEBUFFER_SRGB);

glClearBufferfv(GL_COLOR, 0, &glm::vec4(0.0f, 0.0f, 0.0f, 1.0f)[0]);

glUseProgram(ProgramName[program::TEXTURE]);
Expand All @@ -364,7 +366,6 @@ class gl_320_fbo_srgb_blend : public test
glViewport(0, 0, static_cast<GLsizei>(WindowSize.x), static_cast<GLsizei>(WindowSize.y));

glBindFramebuffer(GL_FRAMEBUFFER, 0);
glDisable(GL_FRAMEBUFFER_SRGB);

glUseProgram(ProgramName[program::SPLASH]);

Expand Down
8 changes: 2 additions & 6 deletions tests/gl-320-fbo-srgb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,11 @@ class gl_320_fbo_srgb : public test
return false;

glBindFramebuffer(GL_FRAMEBUFFER, 0);
return true;

/*
GLint Encoding = 0;
glGetFramebufferAttachmentParameteriv(GL_DRAW_FRAMEBUFFER, GL_BACK_LEFT, GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, &Encoding);
if (Encoding != GL_SRGB)
return false;
*/

return true;
}

bool begin()
Expand Down Expand Up @@ -348,7 +345,6 @@ class gl_320_fbo_srgb : public test
glViewport(0, 0, static_cast<GLsizei>(WindowSize.x) * this->FramebufferScale, static_cast<GLsizei>(WindowSize.y) * this->FramebufferScale);

glBindFramebuffer(GL_FRAMEBUFFER, FramebufferName);

// Explicitly convert linear pixel color to sRGB color space, as FramebufferName is a sRGB FBO
// Shader execution is done with linear color to get correct linear algebra working.
glEnable(GL_FRAMEBUFFER_SRGB);
Expand Down
Loading

0 comments on commit 189b7b9

Please sign in to comment.