archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPUFramebuffer: Bump max attachment count to 8

Browse Source 
This is needed by eevee-rewrite
This commit is contained in:
Clément Foucault
2022-02-04 19:56:36 +01:00
parent 77d005ea36
commit 25c50ddd09
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/intern/gpu_framebuffer_private.hh
View File

@@ -43,8 +43,9 @@ typedef enum GPUAttachmentType : int {
GPU_FB_COLOR_ATTACHMENT3, GPU_FB_COLOR_ATTACHMENT3,
GPU_FB_COLOR_ATTACHMENT4, GPU_FB_COLOR_ATTACHMENT4,
GPU_FB_COLOR_ATTACHMENT5, GPU_FB_COLOR_ATTACHMENT5,
/* Number of maximum output slots. GPU_FB_COLOR_ATTACHMENT6,
* We support 6 outputs for now (usually we wouldn't need more to preserve fill rate). */ GPU_FB_COLOR_ATTACHMENT7,
/* Number of maximum output slots. */
/* Keep in mind that GL max is GL_MAX_DRAW_BUFFERS and is at least 8, corresponding to /* Keep in mind that GL max is GL_MAX_DRAW_BUFFERS and is at least 8, corresponding to
* the maximum number of COLOR attachments specified by glDrawBuffers. */ * the maximum number of COLOR attachments specified by glDrawBuffers. */
GPU_FB_MAX_ATTACHMENT, GPU_FB_MAX_ATTACHMENT,

2
source/blender/gpu/opengl/gl_framebuffer.hh
View File

@@ -141,6 +141,8 @@ static inline GLenum to_gl(const GPUAttachmentType type)
ATTACHMENT(COLOR_ATTACHMENT3); ATTACHMENT(COLOR_ATTACHMENT3);
ATTACHMENT(COLOR_ATTACHMENT4); ATTACHMENT(COLOR_ATTACHMENT4);
ATTACHMENT(COLOR_ATTACHMENT5); ATTACHMENT(COLOR_ATTACHMENT5);
ATTACHMENT(COLOR_ATTACHMENT6);
ATTACHMENT(COLOR_ATTACHMENT7);
default: default:
BLI_assert(0); BLI_assert(0);
return GL_COLOR_ATTACHMENT0; return GL_COLOR_ATTACHMENT0;