BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Hydra tasks refactor #73

Merged
Bogdan Nagirniak merged 8 commits from hydra-tasks-refactor into hydra-render 2023-07-25 22:13:33 +02:00
Conversation 0 Commits 8 Files Changed 12 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e5242f9a7 - Show all commits

2
source/blender/render/hydra/render_task_delegate.cc
View File

@ -257,7 +257,7 @@ void GPURenderTaskDelegate::bind()
void GPURenderTaskDelegate::unbind() void GPURenderTaskDelegate::unbind()
{ {
//glDeleteVertexArrays(1, &VAO_); glDeleteVertexArrays(1, &VAO_);
GPU_framebuffer_free(framebuffer_); GPU_framebuffer_free(framebuffer_);
GPU_texture_free(tex_color_); GPU_texture_free(tex_color_);
GPU_texture_free(tex_depth_); GPU_texture_free(tex_depth_);

6
source/blender/render/hydra/viewport_engine.cc
View File

@ -7,12 +7,12 @@
#include "DNA_vec_types.h" /* this include must be before BKE_camera.h due to "rctf" type */ #include "DNA_vec_types.h" /* this include must be before BKE_camera.h due to "rctf" type */
#include "DNA_camera_types.h"
#include "DNA_screen_types.h"
#include "BKE_camera.h" #include "BKE_camera.h"
#include "BLI_math_matrix.h" #include "BLI_math_matrix.h"
#include "BLI_timecode.h" #include "BLI_timecode.h"
#include "DEG_depsgraph_query.h" #include "DEG_depsgraph_query.h"
#include "DNA_camera_types.h"
#include "DNA_screen_types.h"
#include "GPU_matrix.h" #include "GPU_matrix.h"
#include "PIL_time.h" #include "PIL_time.h"
@ -164,7 +164,7 @@ void DrawTexture::write_data(int width, int height, const void *data)
return; return;
} }
if (texture_ ) { if (texture_) {
GPU_texture_free(texture_); GPU_texture_free(texture_);
} }