TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: auto convert to srgb(a) if sluminance not supported

Browse Source 
This is particularly the case when requesting a core-only profile (gl-version 3 2) where luminance textures are deprecated.

There is apparently no way to emulate them with swizzles (as we do with luminance textures), so we'll have to duplicate the channels out.

Fixes #693
This commit is contained in:
rdb 2019-08-12 21:04:48 +02:00
parent dc599901bc
commit 8be70ed16d
1 changed files with 93 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -275,6 +275,22 @@ uchar_bgr_to_rgb(unsigned char *dest, const unsigned char *source,
}
}
/**
* Recopies the given array of pixels, converting from luminance to RGB
* arrangement.
*/
static void
uchar_l_to_rgb(unsigned char *dest, const unsigned char *source,
int num_pixels) {
for (int i = 0; i < num_pixels; i++) {
dest[0] = source[0];
dest[1] = source[0];
dest[2] = source[0];
dest += 3;
source += 1;
}
}
/**
* Recopies the given array of pixels, converting from BGRA to RGBA
* arrangement.
@ -292,6 +308,23 @@ uchar_bgra_to_rgba(unsigned char *dest, const unsigned char *source,
}
}
/**
* Recopies the given array of pixels, converting from luminance-alpha to RGBA
* arrangement.
*/
static void
uchar_la_to_rgba(unsigned char *dest, const unsigned char *source,
int num_pixels) {
for (int i = 0; i < num_pixels; i++) {
dest[0] = source[0];
dest[1] = source[0];
dest[2] = source[0];
dest[3] = source[1];
dest += 4;
source += 2;
}
}
/**
* Recopies the given array of pixels, converting from BGR to RGB arrangement.
*/
@ -307,6 +340,22 @@ ushort_bgr_to_rgb(unsigned short *dest, const unsigned short *source,
}
}
/**
* Recopies the given array of pixels, converting from luminance to RGB
* arrangement.
*/
static void
ushort_l_to_rgb(unsigned short *dest, const unsigned short *source,
int num_pixels) {
for (int i = 0; i < num_pixels; i++) {
dest[0] = source[0];
dest[1] = source[0];
dest[2] = source[0];
dest += 3;
source += 1;
}
}
/**
* Recopies the given array of pixels, converting from BGRA to RGBA
* arrangement.
@ -324,6 +373,23 @@ ushort_bgra_to_rgba(unsigned short *dest, const unsigned short *source,
}
}
/**
* Recopies the given array of pixels, converting from luminance-alpha to RGBA
* arrangement.
*/
static void
ushort_la_to_rgba(unsigned short *dest, const unsigned short *source,
int num_pixels) {
for (int i = 0; i < num_pixels; i++) {
dest[0] = source[0];
dest[1] = source[0];
dest[2] = source[0];
dest[3] = source[1];
dest += 4;
source += 2;
}
}
/**
* Reverses the order of the components within the image, to convert (for
* instance) GL_BGR to GL_RGB. Returns the byte pointer representing the
@ -343,6 +409,12 @@ fix_component_ordering(PTA_uchar &new_image,
switch (external_format) {
case GL_RGB:
if (tex->get_num_components() == 1) {
new_image = PTA_uchar::empty_array(orig_image_size * 3);
uchar_l_to_rgb(new_image, orig_image, orig_image_size);
result = new_image;
break;
}
switch (tex->get_component_type()) {
case Texture::T_unsigned_byte:
case Texture::T_byte:
@ -366,6 +438,12 @@ fix_component_ordering(PTA_uchar &new_image,
break;
case GL_RGBA:
if (tex->get_num_components() == 2) {
new_image = PTA_uchar::empty_array(orig_image_size * 2);
uchar_la_to_rgba(new_image, orig_image, orig_image_size / 2);
result = new_image;
break;
}
switch (tex->get_component_type()) {
case Texture::T_unsigned_byte:
case Texture::T_byte:
@ -9450,7 +9528,6 @@ get_external_image_format(Texture *tex) const {
return _supports_bgr ? GL_BGRA : GL_RGBA;
case Texture::F_luminance:
case Texture::F_sluminance:
#ifdef OPENGLES
return GL_LUMINANCE;
#else
@ -9458,13 +9535,25 @@ get_external_image_format(Texture *tex) const {
#endif
case Texture::F_luminance_alphamask:
case Texture::F_luminance_alpha:
case Texture::F_sluminance_alpha:
#ifdef OPENGLES
return GL_LUMINANCE_ALPHA;
#else
return _supports_luminance_texture ? GL_LUMINANCE_ALPHA : GL_RG;
#endif
case Texture::F_sluminance:
#ifdef OPENGLES
return GL_LUMINANCE;
#else
return _supports_luminance_texture ? GL_LUMINANCE : GL_RGB;
#endif
case Texture::F_sluminance_alpha:
#ifdef OPENGLES
return GL_LUMINANCE_ALPHA;
#else
return _supports_luminance_texture ? GL_LUMINANCE_ALPHA : GL_RGBA;
#endif
#ifndef OPENGLES_1
case Texture::F_r8i:
case Texture::F_r16i:
@ -10200,9 +10289,9 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
#endif
#ifndef OPENGLES
case Texture::F_sluminance:
return GL_SLUMINANCE8;
return _core_profile ? GL_SRGB8 : GL_SLUMINANCE8;
case Texture::F_sluminance_alpha:
return GL_SLUMINANCE8_ALPHA8;
return _core_profile ? GL_SRGB8_ALPHA8 : GL_SLUMINANCE8_ALPHA8;
#endif
#ifndef OPENGLES