blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 761 Projects 19 Wiki Activity

WIP: eevee-next-world-irradiance #108304

Closed
Jeroen Bakker wants to merge 79 commits from Jeroen-Bakker:eevee-next-world-irradiance into main
pull from: Jeroen-Bakker:eevee-next-world-irradiance
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 79 Files Changed 22 +11 -1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 34adebcf43 - Show all commits

2
source/blender/gpu/intern/gpu_framebuffer.cc
View File

@ -378,7 +378,7 @@ void GPU_framebuffer_config_array(GPUFrameBuffer *gpu_fb,
void GPU_framebuffer_default_size(GPUFrameBuffer *gpu_fb, int width, int height)
{
unwrap(gpu_fb)->size_set(width, height);
unwrap(gpu_fb)->default_size_set(width, height);
}
/* ---------- Viewport & Scissor Region ----------- */

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

@ -137,6 +137,7 @@ class FrameBuffer {
void *userData);
uint get_bits_per_pixel();
/* Sets the size after creation. */
inline void size_set(int width, int height)
{
width_ = width;
@ -144,6 +145,15 @@ class FrameBuffer {
dirty_state_ = true;
}
/* Sets the size for frame-buffer with no attachments. */
inline void default_size_set(int width, int height)
{
width_ = width;
height_ = height;
dirty_attachments_ = true;
dirty_state_ = true;
}
inline void viewport_set(const int viewport[4])
{
if (!equals_v4v4_int(viewport_, viewport)) {