blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

GPUTexture: Add supports for GL_DEPTH32F_STENCIL8 texture format

This commit is contained in:
Clément Foucault 2018-10-25 19:08:35 +02:00
parent a321f68f64
commit 48b56481ea
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/GPU_texture.h
View File

@ -100,9 +100,9 @@ typedef enum GPUTextureFormat {
#if 0
GPU_RGB10_A2,
GPU_RGB10_A2UI,
GPU_DEPTH32F_STENCIL8,
#endif
GPU_R11F_G11F_B10F,
GPU_DEPTH32F_STENCIL8,
GPU_DEPTH24_STENCIL8,
/* Texture only format */

1
source/blender/gpu/intern/gpu_framebuffer.c
View File

@ -101,6 +101,7 @@ static GPUAttachmentType attachment_type_from_tex(GPUTexture *tex, int slot)
case GPU_DEPTH_COMPONENT16:
return GPU_FB_DEPTH_ATTACHMENT;
case GPU_DEPTH24_STENCIL8:
case GPU_DEPTH32F_STENCIL8:
return GPU_FB_DEPTH_STENCIL_ATTACHMENT;
default:
return GPU_FB_COLOR_ATTACHMENT0 + slot;

18
source/blender/gpu/intern/gpu_texture.c
View File

@ -170,7 +170,10 @@ static void gpu_validate_data_format(GPUTextureFormat tex_format, GPUDataFormat
{
BLI_assert(data_format == GPU_DATA_FLOAT);
}
else if (tex_format == GPU_DEPTH24_STENCIL8) {
else if (ELEM(tex_format,
GPU_DEPTH24_STENCIL8,
GPU_DEPTH32F_STENCIL8))
{
BLI_assert(data_format == GPU_DATA_UNSIGNED_INT_24_8);
}
else {
@ -207,7 +210,10 @@ static GPUDataFormat gpu_get_data_format_from_tex_format(GPUTextureFormat tex_fo
{
return GPU_DATA_FLOAT;
}
else if (tex_format == GPU_DEPTH24_STENCIL8) {
else if (ELEM(tex_format,
GPU_DEPTH24_STENCIL8,
GPU_DEPTH32F_STENCIL8))
{
return GPU_DATA_UNSIGNED_INT_24_8;
}
else {
@ -245,7 +251,10 @@ static GLenum gpu_get_gl_dataformat(GPUTextureFormat data_type, GPUTextureFormat
*format_flag |= GPU_FORMAT_DEPTH;
return GL_DEPTH_COMPONENT;
}
else if (data_type == GPU_DEPTH24_STENCIL8) {
else if (ELEM(data_type,
GPU_DEPTH24_STENCIL8,
GPU_DEPTH32F_STENCIL8))
{
*format_flag |= GPU_FORMAT_DEPTH | GPU_FORMAT_STENCIL;
return GL_DEPTH_STENCIL;
}
@ -293,6 +302,8 @@ static uint gpu_get_bytesize(GPUTextureFormat data_type)
return 16;
case GPU_RGB16F:
return 12;
case GPU_DEPTH32F_STENCIL8:
return 8;
case GPU_RG16F:
case GPU_RG16I:
case GPU_RG16UI:
@ -350,6 +361,7 @@ static GLenum gpu_get_gl_internalformat(GPUTextureFormat format)
/* Special formats texture & renderbuffer */
case GPU_R11F_G11F_B10F: return GL_R11F_G11F_B10F;
case GPU_DEPTH24_STENCIL8: return GL_DEPTH24_STENCIL8;
case GPU_DEPTH32F_STENCIL8: return GL_DEPTH32F_STENCIL8;
/* Texture only format */
/* ** Add Format here **/
/* Special formats texture only */