godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15304 from godotengine/revert-15051-bug-fixes 

Revert "Add missing image format RGB10A2. Fixes #14964"
This commit is contained in:
Juan Linietsky 2018-01-03 16:43:46 -03:00 committed by GitHub
parent b7b0ffd5c4 474523d409
commit 16a49cca04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/image.cpp
View File

@ -47,7 +47,6 @@ const char *Image::format_names[Image::FORMAT_MAX] = {
"RGBA8", "RGBA8",
"RGBA4444", "RGBA4444",
"RGBA5551", "RGBA5551",
"RGB10A2",
"RFloat", //float "RFloat", //float
"RGFloat", "RGFloat",
"RGBFloat", "RGBFloat",
@ -113,7 +112,6 @@ int Image::get_format_pixel_size(Format p_format) {
case FORMAT_RGBA8: return 4; case FORMAT_RGBA8: return 4;
case FORMAT_RGBA4444: return 2; case FORMAT_RGBA4444: return 2;
case FORMAT_RGBA5551: return 2; case FORMAT_RGBA5551: return 2;
case FORMAT_RGB10A2: return 4;
case FORMAT_RF: case FORMAT_RF:
return 4; //float return 4; //float
case FORMAT_RGF: return 8; case FORMAT_RGF: return 8;
@ -1980,15 +1978,6 @@ Color Image::get_pixel(int p_x, int p_y) const {
float a = ((u >> 15) & 0x1) / 1.0; float a = ((u >> 15) & 0x1) / 1.0;
return Color(r, g, b, a); return Color(r, g, b, a);
} break; } break;
case FORMAT_RGB10A2: {
uint32_t u = ((uint32_t *)ptr)[ofs];
float r = (u & 0x3FF) / 1023.0;
float g = ((u >> 10) & 0x3FF) / 1023.0;
float b = ((u >> 20) & 0x3FF) / 1023.0;
float a = ((u >> 30) & 0x3) / 3.0;
return Color(r, g, b, a);
} break;
case FORMAT_RF: { case FORMAT_RF: {
float r = ((float *)ptr)[ofs]; float r = ((float *)ptr)[ofs];
@ -2133,18 +2122,6 @@ void Image::set_pixel(int p_x, int p_y, const Color &p_color) {
((uint16_t *)ptr)[ofs] = rgba; ((uint16_t *)ptr)[ofs] = rgba;
} break;
case FORMAT_RGB10A2: {
uint32_t rgba = 0;
rgba = uint32_t(CLAMP(p_color.r * 1023.0, 0, 1023));
rgba |= uint32_t(CLAMP(p_color.g * 1023.0, 0, 1023)) << 10;
rgba |= uint32_t(CLAMP(p_color.b * 1023.0, 0, 1023)) << 20;
rgba |= uint32_t(CLAMP(p_color.a * 3.0, 0, 3)) << 30;
((uint32_t *)ptr)[ofs] = rgba;
} break; } break;
case FORMAT_RF: { case FORMAT_RF: {
@ -2323,7 +2300,6 @@ void Image::_bind_methods() {
BIND_ENUM_CONSTANT(FORMAT_RGBA8); BIND_ENUM_CONSTANT(FORMAT_RGBA8);
BIND_ENUM_CONSTANT(FORMAT_RGBA4444); BIND_ENUM_CONSTANT(FORMAT_RGBA4444);
BIND_ENUM_CONSTANT(FORMAT_RGBA5551); BIND_ENUM_CONSTANT(FORMAT_RGBA5551);
BIND_ENUM_CONSTANT(FORMAT_RGB10A2);
BIND_ENUM_CONSTANT(FORMAT_RF); //float BIND_ENUM_CONSTANT(FORMAT_RF); //float
BIND_ENUM_CONSTANT(FORMAT_RGF); BIND_ENUM_CONSTANT(FORMAT_RGF);
BIND_ENUM_CONSTANT(FORMAT_RGBF); BIND_ENUM_CONSTANT(FORMAT_RGBF);

1
core/image.h
View File

@ -68,7 +68,6 @@ public:
FORMAT_RGBA8, FORMAT_RGBA8,
FORMAT_RGBA4444, FORMAT_RGBA4444,
FORMAT_RGBA5551, FORMAT_RGBA5551,
FORMAT_RGB10A2,
FORMAT_RF, //float FORMAT_RF, //float
FORMAT_RGF, FORMAT_RGF,
FORMAT_RGBF, FORMAT_RGBF,

9
drivers/gles3/rasterizer_storage_gles3.cpp
View File

@ -192,13 +192,6 @@ Ref<Image> RasterizerStorageGLES3::_get_gl_image_and_format(const Ref<Image> &p_
r_gl_format = GL_RGBA; r_gl_format = GL_RGBA;
r_gl_type = GL_UNSIGNED_SHORT_5_5_5_1; r_gl_type = GL_UNSIGNED_SHORT_5_5_5_1;
} break;
case Image::FORMAT_RGB10A2: {
r_gl_internal_format = GL_RGB10_A2;
r_gl_format = GL_RGBA;
r_gl_type = GL_UNSIGNED_INT_2_10_10_10_REV;
} break; } break;
case Image::FORMAT_RF: { case Image::FORMAT_RF: {
@ -6097,7 +6090,7 @@ void RasterizerStorageGLES3::_render_target_allocate(RenderTarget *rt) {
color_internal_format = GL_RGB10_A2; color_internal_format = GL_RGB10_A2;
color_format = GL_RGBA; color_format = GL_RGBA;
color_type = GL_UNSIGNED_INT_2_10_10_10_REV; color_type = GL_UNSIGNED_INT_2_10_10_10_REV;
image_format = Image::FORMAT_RGB10A2; image_format = Image::FORMAT_RGBA8;
} else { } else {
color_internal_format = GL_RGBA8; color_internal_format = GL_RGBA8;