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

WindowManager: Remove Stereo Offscreen

Browse Source 
Stereo offscreen rendering has been replaced with stereo viewport
rendering. When an offscreen buffer is used it is only used for mono
rendering.

This patch will remove the second offscreen buffer.

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D7153
This commit is contained in:
Jeroen Bakker
2020-03-19 08:00:05 +01:00
committed by Jeroen Bakker
parent d68d1da1f3
commit fe045b2b77
2 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/windowmanager/intern/wm_draw.c
View File

@@ -333,13 +333,13 @@ static void wm_draw_region_buffer_free(ARegion *region)
{ {
if (region->draw_buffer) { if (region->draw_buffer) {
for (int view = 0; view < 2; view++) { for (int view = 0; view < 2; view++) {
if (region->draw_buffer->offscreen[view]) {
GPU_offscreen_free(region->draw_buffer->offscreen[view]);
}
if (region->draw_buffer->viewport[view]) { if (region->draw_buffer->viewport[view]) {
GPU_viewport_free(region->draw_buffer->viewport[view]); GPU_viewport_free(region->draw_buffer->viewport[view]);
} }
} }
if (region->draw_buffer->offscreen) {
GPU_offscreen_free(region->draw_buffer->offscreen);
}
MEM_freeN(region->draw_buffer); MEM_freeN(region->draw_buffer);
region->draw_buffer = NULL; region->draw_buffer = NULL;
@@ -374,7 +374,7 @@ static void wm_draw_region_buffer_create(ARegion *region, bool stereo, bool use_
} }
else { else {
/* Free offscreen buffer on size changes. Viewport auto resizes. */ /* Free offscreen buffer on size changes. Viewport auto resizes. */
GPUOffScreen *offscreen = region->draw_buffer->offscreen[0]; GPUOffScreen *offscreen = region->draw_buffer->offscreen;
if (offscreen && (GPU_offscreen_width(offscreen) != region->winx || if (offscreen && (GPU_offscreen_width(offscreen) != region->winx ||
GPU_offscreen_height(offscreen) != region->winy)) { GPU_offscreen_height(offscreen) != region->winy)) {
wm_draw_region_buffer_free(region); wm_draw_region_buffer_free(region);
@@ -402,21 +402,8 @@ static void wm_draw_region_buffer_create(ARegion *region, bool stereo, bool use_
wm_draw_offscreen_texture_parameters(offscreen); wm_draw_offscreen_texture_parameters(offscreen);
GPUOffScreen *offscreen_right = NULL;
if (stereo) {
offscreen_right = GPU_offscreen_create(region->winx, region->winy, 0, false, false, NULL);
if (!offscreen_right) {
GPU_offscreen_free(offscreen);
return;
}
wm_draw_offscreen_texture_parameters(offscreen_right);
}
region->draw_buffer = MEM_callocN(sizeof(wmDrawBuffer), "wmDrawBuffer"); region->draw_buffer = MEM_callocN(sizeof(wmDrawBuffer), "wmDrawBuffer");
region->draw_buffer->offscreen[0] = offscreen; region->draw_buffer->offscreen = offscreen;
region->draw_buffer->offscreen[1] = offscreen_right;
} }
region->draw_buffer->bound_view = -1; region->draw_buffer->bound_view = -1;
@@ -434,7 +421,7 @@ static void wm_draw_region_bind(ARegion *region, int view)
GPU_viewport_bind(region->draw_buffer->viewport[view], &region->winrct); GPU_viewport_bind(region->draw_buffer->viewport[view], &region->winrct);
} }
else { else {
GPU_offscreen_bind(region->draw_buffer->offscreen[view], false); GPU_offscreen_bind(region->draw_buffer->offscreen, false);
/* For now scissor is expected by region drawing, we could disable it /* For now scissor is expected by region drawing, we could disable it
* and do the enable/disable in the specific cases that setup scissor. */ * and do the enable/disable in the specific cases that setup scissor. */
@@ -458,7 +445,7 @@ static void wm_draw_region_unbind(ARegion *region, int view)
} }
else { else {
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
GPU_offscreen_unbind(region->draw_buffer->offscreen[view], false); GPU_offscreen_unbind(region->draw_buffer->offscreen, false);
} }
} }
@@ -473,8 +460,7 @@ static void wm_draw_region_blit(ARegion *region, int view)
view = 0; view = 0;
} }
else if (view > 0) { else if (view > 0) {
if (region->draw_buffer->viewport[view] == NULL && if (region->draw_buffer->viewport[view] == NULL) {
region->draw_buffer->offscreen[view] == NULL) {
/* Region does not need stereo or failed to allocate stereo buffers. */ /* Region does not need stereo or failed to allocate stereo buffers. */
view = 0; view = 0;
} }
@@ -485,7 +471,7 @@ static void wm_draw_region_blit(ARegion *region, int view)
} }
else { else {
GPU_offscreen_draw_to_screen( GPU_offscreen_draw_to_screen(
region->draw_buffer->offscreen[view], region->winrct.xmin, region->winrct.ymin); region->draw_buffer->offscreen, region->winrct.xmin, region->winrct.ymin);
} }
} }
@@ -499,7 +485,7 @@ GPUTexture *wm_draw_region_texture(ARegion *region, int view)
return GPU_viewport_color_texture(region->draw_buffer->viewport[view]); return GPU_viewport_color_texture(region->draw_buffer->viewport[view]);
} }
else { else {
return GPU_offscreen_color_texture(region->draw_buffer->offscreen[view]); return GPU_offscreen_color_texture(region->draw_buffer->offscreen);
} }
} }

2
source/blender/windowmanager/wm_draw.h
View File

@@ -31,7 +31,7 @@ struct GPUTexture;
struct GPUViewport; struct GPUViewport;
typedef struct wmDrawBuffer { typedef struct wmDrawBuffer {
struct GPUOffScreen *offscreen[2]; struct GPUOffScreen *offscreen;
struct GPUViewport *viewport[2]; struct GPUViewport *viewport[2];
bool stereo; bool stereo;
int bound_view; int bound_view;