Skip to content

Commit cd3a6c8

Browse files
RepiteoRepiteo
committed
Merge pull request #106200 from BlueCube3310/image-16-u16
Image: Implement 16-bit unorm and uint formats
2 parents 5a8a3ed + 16b9ee6 commit cd3a6c8

File tree

13 files changed

+918
-67
lines changed

13 files changed

+918
-67
lines changed

‎core/io/image.cpp‎

Lines changed: 408 additions & 65 deletions
Large diffs are not rendered by default.

‎core/io/image.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@ class Image : public Resource {
111111
FORMAT_ASTC_4x4_HDR,
112112
FORMAT_ASTC_8x8,
113113
FORMAT_ASTC_8x8_HDR,
114+
FORMAT_R16,
115+
FORMAT_RG16,
116+
FORMAT_RGB16,
117+
FORMAT_RGBA16,
118+
FORMAT_R16I,
119+
FORMAT_RG16I,
120+
FORMAT_RGB16I,
121+
FORMAT_RGBA16I,
114122
FORMAT_MAX
115123
};
116124

@@ -282,10 +290,12 @@ class Image : public Resource {
282290
static void average_4_float(float &p_out, const float &p_a, const float &p_b, const float &p_c, const float &p_d);
283291
static void average_4_half(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d);
284292
static void average_4_rgbe9995(uint32_t &p_out, const uint32_t &p_a, const uint32_t &p_b, const uint32_t &p_c, const uint32_t &p_d);
293+
static void average_4_uint16(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d);
285294
static void renormalize_uint8(uint8_t *p_rgb);
286295
static void renormalize_float(float *p_rgb);
287296
static void renormalize_half(uint16_t *p_rgb);
288297
static void renormalize_rgbe9995(uint32_t *p_rgb);
298+
static void renormalize_uint16(uint16_t *p_rgb);
289299

290300
public:
291301
int get_width() const;

‎doc/classes/Image.xml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,43 @@
761761
<constant name="FORMAT_ASTC_8x8_HDR" value="38" enum="Format">
762762
Same format as [constant FORMAT_ASTC_8x8], but with the hint to let the GPU know it is used for HDR.
763763
</constant>
764-
<constant name="FORMAT_MAX" value="39" enum="Format">
764+
<constant name="FORMAT_R16" value="39" enum="Format">
765+
OpenGL texture format [code]GL_R16[/code] where there's one component, a 16-bit unsigned normalized integer value. Since the value is normalized, each component is clamped between [code]0.0[/code] and [code]1.0[/code] (inclusive).
766+
[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be used on desktop or console devices. It may be unsupported on mobile or web, and will consequently be converted to [constant FORMAT_RF].
767+
</constant>
768+
<constant name="FORMAT_RG16" value="40" enum="Format">
769+
OpenGL texture format [code]GL_RG16[/code] where there are two components, each a 16-bit unsigned normalized integer value. Since the value is normalized, each component is clamped between [code]0.0[/code] and [code]1.0[/code] (inclusive).
770+
[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be used on desktop or console devices. It may be unsupported on mobile or web, and will consequently be converted to [constant FORMAT_RGF].
771+
</constant>
772+
<constant name="FORMAT_RGB16" value="41" enum="Format">
773+
OpenGL texture format [code]GL_RGB16[/code] where there are three components, each a 16-bit unsigned normalized integer value. Since the value is normalized, each component is clamped between [code]0.0[/code] and [code]1.0[/code] (inclusive).
774+
[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be used on desktop or console devices. It may be unsupported on mobile or web, and will consequently be converted to [constant FORMAT_RGBF].
775+
</constant>
776+
<constant name="FORMAT_RGBA16" value="42" enum="Format">
777+
OpenGL texture format [code]GL_RGBA16[/code] where there are four components, each a 16-bit unsigned normalized integer value. Since the value is normalized, each component is clamped between [code]0.0[/code] and [code]1.0[/code] (inclusive).
778+
[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be used on desktop or console devices. It may be unsupported on mobile or web, and will consequently be converted to [constant FORMAT_RGBAF].
779+
</constant>
780+
<constant name="FORMAT_R16I" value="43" enum="Format">
781+
OpenGL texture format [code]GL_R16UI[/code] where there's one component, a 16-bit unsigned integer value. Each component is clamped between [code]0[/code] and [code]65535[/code] (inclusive).
782+
[b]Note:[/b] When used in a shader, the texture requires usage of [code]usampler[/code] samplers. Additionally, it only supports nearest-neighbor filtering under the Compatibility renderer.
783+
[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s have to be divided by [code]65535[/code] to get the correct color value.
784+
</constant>
785+
<constant name="FORMAT_RG16I" value="44" enum="Format">
786+
OpenGL texture format [code]GL_RG16UI[/code] where there are two components, each a 16-bit unsigned integer value. Each component is clamped between [code]0[/code] and [code]65535[/code] (inclusive).
787+
[b]Note:[/b] When used in a shader, the texture requires usage of [code]usampler[/code] samplers. Additionally, it only supports nearest-neighbor filtering under the Compatibility renderer.
788+
[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s have to be divided by [code]65535[/code] to get the correct color value.
789+
</constant>
790+
<constant name="FORMAT_RGB16I" value="45" enum="Format">
791+
OpenGL texture format [code]GL_RGB16UI[/code] where there are three components, each a 16-bit unsigned integer value. Each component is clamped between [code]0[/code] and [code]65535[/code] (inclusive).
792+
[b]Note:[/b] When used in a shader, the texture requires usage of [code]usampler[/code] samplers. Additionally, it only supports nearest-neighbor filtering under the Compatibility renderer.
793+
[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s have to be divided by [code]65535[/code] to get the correct color value.
794+
</constant>
795+
<constant name="FORMAT_RGBA16I" value="46" enum="Format">
796+
OpenGL texture format [code]GL_RGBA16UI[/code] where there are four components, each a 16-bit unsigned integer value. Each component is clamped between [code]0[/code] and [code]65535[/code] (inclusive).
797+
[b]Note:[/b] When used in a shader, the texture requires usage of [code]usampler[/code] samplers. Additionally, it only supports nearest-neighbor filtering under the Compatibility renderer.
798+
[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s have to be divided by [code]65535[/code] to get the correct color value.
799+
</constant>
800+
<constant name="FORMAT_MAX" value="47" enum="Format">
765801
Represents the size of the [enum Format] enum.
766802
</constant>
767803
<constant name="INTERPOLATE_NEAREST" value="0" enum="Interpolation">

‎drivers/gles3/storage/config.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ Config::Config() {
9090
s3tc_supported = true;
9191
rgtc_supported = true; //RGTC - core since OpenGL version 3.0
9292
srgb_framebuffer_supported = true;
93+
unorm16_texture_supported = true;
9394
} else {
9495
float_texture_supported = extensions.has("GL_EXT_color_buffer_float");
9596
float_texture_linear_supported = extensions.has("GL_OES_texture_float_linear");
@@ -104,6 +105,7 @@ Config::Config() {
104105
#endif
105106
rgtc_supported = extensions.has("GL_EXT_texture_compression_rgtc") || extensions.has("GL_ARB_texture_compression_rgtc");
106107
srgb_framebuffer_supported = extensions.has("GL_EXT_sRGB_write_control");
108+
unorm16_texture_supported = extensions.has("GL_EXT_texture_norm16");
107109
}
108110

109111
glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &max_vertex_texture_image_units);

‎drivers/gles3/storage/config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class Config {
8282
bool astc_layered_supported = false;
8383
bool astc_3d_supported = false;
8484
bool srgb_framebuffer_supported = false;
85+
bool unorm16_texture_supported = false;
8586

8687
bool force_vertex_shading = false;
8788
bool specular_occlusion = false;

‎drivers/gles3/storage/texture_storage.cpp‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,126 @@ static inline Error _get_gl_uncompressed_format(const Ref<Image> &p_image, Image
505505
r_gl_format = GL_RGB;
506506
r_gl_type = GL_UNSIGNED_INT_5_9_9_9_REV;
507507
} break;
508+
case Image::FORMAT_R16: {
509+
if (config->unorm16_texture_supported) {
510+
r_gl_internal_format = _EXT_R16;
511+
r_gl_format = GL_RED;
512+
r_gl_type = GL_UNSIGNED_SHORT;
513+
} else {
514+
if (config->float_texture_linear_supported) {
515+
if (p_image.is_valid()) {
516+
p_image->convert(Image::FORMAT_RF);
517+
}
518+
r_real_format = Image::FORMAT_RF;
519+
r_gl_internal_format = GL_R32F;
520+
r_gl_format = GL_RED;
521+
r_gl_type = GL_FLOAT;
522+
} else {
523+
if (p_image.is_valid()) {
524+
p_image->convert(Image::FORMAT_RH);
525+
}
526+
r_real_format = Image::FORMAT_RH;
527+
r_gl_internal_format = GL_R16F;
528+
r_gl_format = GL_RED;
529+
r_gl_type = GL_HALF_FLOAT;
530+
}
531+
}
532+
} break;
533+
case Image::FORMAT_RG16: {
534+
if (config->unorm16_texture_supported) {
535+
r_gl_internal_format = _EXT_RG16;
536+
r_gl_format = GL_RG;
537+
r_gl_type = GL_UNSIGNED_SHORT;
538+
} else {
539+
if (config->float_texture_linear_supported) {
540+
if (p_image.is_valid()) {
541+
p_image->convert(Image::FORMAT_RGF);
542+
}
543+
r_real_format = Image::FORMAT_RGF;
544+
r_gl_internal_format = GL_RG32F;
545+
r_gl_format = GL_RG;
546+
r_gl_type = GL_FLOAT;
547+
} else {
548+
if (p_image.is_valid()) {
549+
p_image->convert(Image::FORMAT_RGH);
550+
}
551+
r_real_format = Image::FORMAT_RGH;
552+
r_gl_internal_format = GL_RG16F;
553+
r_gl_format = GL_RG;
554+
r_gl_type = GL_HALF_FLOAT;
555+
}
556+
}
557+
} break;
558+
case Image::FORMAT_RGB16: {
559+
if (config->unorm16_texture_supported) {
560+
r_gl_internal_format = _EXT_RGB16;
561+
r_gl_format = GL_RGB;
562+
r_gl_type = GL_UNSIGNED_SHORT;
563+
} else {
564+
if (config->float_texture_linear_supported) {
565+
if (p_image.is_valid()) {
566+
p_image->convert(Image::FORMAT_RGBF);
567+
}
568+
r_real_format = Image::FORMAT_RGBF;
569+
r_gl_internal_format = GL_RGB32F;
570+
r_gl_format = GL_RGB;
571+
r_gl_type = GL_FLOAT;
572+
} else {
573+
if (p_image.is_valid()) {
574+
p_image->convert(Image::FORMAT_RGBH);
575+
}
576+
r_real_format = Image::FORMAT_RGBH;
577+
r_gl_internal_format = GL_RGB16F;
578+
r_gl_format = GL_RGB;
579+
r_gl_type = GL_HALF_FLOAT;
580+
}
581+
}
582+
} break;
583+
case Image::FORMAT_RGBA16: {
584+
if (config->unorm16_texture_supported) {
585+
r_gl_internal_format = _EXT_RGBA16;
586+
r_gl_format = GL_RGBA;
587+
r_gl_type = GL_UNSIGNED_SHORT;
588+
} else {
589+
if (config->float_texture_linear_supported) {
590+
if (p_image.is_valid()) {
591+
p_image->convert(Image::FORMAT_RGBAF);
592+
}
593+
r_real_format = Image::FORMAT_RGBAF;
594+
r_gl_internal_format = GL_RGBA32F;
595+
r_gl_format = GL_RGBA;
596+
r_gl_type = GL_FLOAT;
597+
} else {
598+
if (p_image.is_valid()) {
599+
p_image->convert(Image::FORMAT_RGH);
600+
}
601+
r_real_format = Image::FORMAT_RGH;
602+
r_gl_internal_format = GL_RGBA16F;
603+
r_gl_format = GL_RGBA;
604+
r_gl_type = GL_HALF_FLOAT;
605+
}
606+
}
607+
} break;
608+
case Image::FORMAT_R16I: {
609+
r_gl_internal_format = GL_R16UI;
610+
r_gl_format = GL_RED_INTEGER;
611+
r_gl_type = GL_UNSIGNED_SHORT;
612+
} break;
613+
case Image::FORMAT_RG16I: {
614+
r_gl_internal_format = GL_RG16UI;
615+
r_gl_format = GL_RG_INTEGER;
616+
r_gl_type = GL_UNSIGNED_SHORT;
617+
} break;
618+
case Image::FORMAT_RGB16I: {
619+
r_gl_internal_format = GL_RGB16UI;
620+
r_gl_format = GL_RGB_INTEGER;
621+
r_gl_type = GL_UNSIGNED_SHORT;
622+
} break;
623+
case Image::FORMAT_RGBA16I: {
624+
r_gl_internal_format = GL_RGBA16UI;
625+
r_gl_format = GL_RGBA_INTEGER;
626+
r_gl_type = GL_UNSIGNED_SHORT;
627+
} break;
508628
default: {
509629
return ERR_UNAVAILABLE;
510630
}

‎drivers/gles3/storage/texture_storage.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ namespace GLES3 {
112112

113113
#define _EXT_TEXTURE_CUBE_MAP_SEAMLESS 0x884F
114114

115+
#define _EXT_R16 0x822A
116+
#define _EXT_RG16 0x822C
117+
#define _EXT_RGB16 0x8054
118+
#define _EXT_RGBA16 0x805B
119+
115120
enum DefaultGLTexture {
116121
DEFAULT_GL_TEXTURE_WHITE,
117122
DEFAULT_GL_TEXTURE_BLACK,

‎modules/betsy/image_compress_betsy.cpp‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,40 @@ static Error get_src_texture_format(Image *r_img, RD::DataFormat &r_format) {
351351
r_format = RD::DATA_FORMAT_E5B9G9R9_UFLOAT_PACK32;
352352
break;
353353

354+
case Image::FORMAT_R16:
355+
r_format = RD::DATA_FORMAT_R16_UNORM;
356+
break;
357+
358+
case Image::FORMAT_RG16:
359+
r_format = RD::DATA_FORMAT_R16G16_UNORM;
360+
break;
361+
362+
case Image::FORMAT_RGB16:
363+
r_img->convert(Image::FORMAT_RGBA16);
364+
r_format = RD::DATA_FORMAT_R16G16B16A16_UNORM;
365+
break;
366+
367+
case Image::FORMAT_RGBA16:
368+
r_format = RD::DATA_FORMAT_R16G16B16A16_UNORM;
369+
break;
370+
371+
case Image::FORMAT_R16I:
372+
r_format = RD::DATA_FORMAT_R16_UINT;
373+
break;
374+
375+
case Image::FORMAT_RG16I:
376+
r_format = RD::DATA_FORMAT_R16G16_UINT;
377+
break;
378+
379+
case Image::FORMAT_RGB16I:
380+
r_img->convert(Image::FORMAT_RGBA16I);
381+
r_format = RD::DATA_FORMAT_R16G16B16A16_UINT;
382+
break;
383+
384+
case Image::FORMAT_RGBA16I:
385+
r_format = RD::DATA_FORMAT_R16G16B16A16_UINT;
386+
break;
387+
354388
default: {
355389
return ERR_UNAVAILABLE;
356390
}

‎modules/dds/dds_enums.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ enum DDSFourCC {
7474
DDFCC_BC5U = PF_FOURCC("BC5U"),
7575
DDFCC_A2XY = PF_FOURCC("A2XY"),
7676
DDFCC_DX10 = PF_FOURCC("DX10"),
77+
DDFCC_RGBA16 = 36,
7778
DDFCC_R16F = 111,
7879
DDFCC_RG16F = 112,
7980
DDFCC_RGBA16F = 113,
@@ -87,14 +88,20 @@ enum DXGIFormat {
8788
DXGI_R32G32B32A32_FLOAT = 2,
8889
DXGI_R32G32B32_FLOAT = 6,
8990
DXGI_R16G16B16A16_FLOAT = 10,
91+
DXGI_R16G16B16A16_UNORM = 11,
92+
DXGI_R16G16B16A16_UINT = 12,
9093
DXGI_R32G32_FLOAT = 16,
9194
DXGI_R10G10B10A2_UNORM = 24,
9295
DXGI_R8G8B8A8_UNORM = 28,
9396
DXGI_R8G8B8A8_UNORM_SRGB = 29,
9497
DXGI_R16G16_FLOAT = 34,
98+
DXGI_R16G16_UNORM = 35,
99+
DXGI_R16G16_UINT = 36,
95100
DXGI_R32_FLOAT = 41,
96101
DXGI_R8G8_UNORM = 49,
97102
DXGI_R16_FLOAT = 54,
103+
DXGI_R16_UNORM = 56,
104+
DXGI_R16_UINT = 57,
98105
DXGI_R8_UNORM = 61,
99106
DXGI_A8_UNORM = 65,
100107
DXGI_R9G9B9E5 = 67,
@@ -127,6 +134,12 @@ enum DDSFormat {
127134
DDS_BC6U,
128135
DDS_BC6S,
129136
DDS_BC7,
137+
DDS_R16,
138+
DDS_RG16,
139+
DDS_RGBA16,
140+
DDS_R16I,
141+
DDS_RG16I,
142+
DDS_RGBA16I,
130143
DDS_R16F,
131144
DDS_RG16F,
132145
DDS_RGBA16F,
@@ -180,6 +193,12 @@ static const DDSFormatInfo dds_format_info[DDS_MAX] = {
180193
{ "BC6UF", true, 4, 16, Image::FORMAT_BPTC_RGBFU },
181194
{ "BC6SF", true, 4, 16, Image::FORMAT_BPTC_RGBF },
182195
{ "BC7", true, 4, 16, Image::FORMAT_BPTC_RGBA },
196+
{ "R16", false, 1, 2, Image::FORMAT_R16 },
197+
{ "RG16", false, 1, 4, Image::FORMAT_RG16 },
198+
{ "RGBA16", false, 1, 8, Image::FORMAT_RGBA16 },
199+
{ "R16I", false, 1, 2, Image::FORMAT_R16I },
200+
{ "RG16I", false, 1, 4, Image::FORMAT_RG16I },
201+
{ "RGBA16I", false, 1, 8, Image::FORMAT_RGBA16I },
183202
{ "R16F", false, 1, 2, Image::FORMAT_RH },
184203
{ "RG16F", false, 1, 4, Image::FORMAT_RGH },
185204
{ "RGBA16F", false, 1, 8, Image::FORMAT_RGBAH },

0 commit comments

Comments
 (0)