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

Fix rendering of Final render for Storm delegate #61

Merged
Bogdan Nagirniak merged 11 commits from BLEN-437 into hydra-render 2023-07-12 23:18:03 +02:00
Conversation 0 Commits 11 Files Changed 11 +13 -8
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bdacb8d2ad - Show all commits

3
scripts/modules/bpy_hydra.py
View File

@ -92,6 +92,9 @@ class HydraRenderEngine(bpy.types.RenderEngine):
# final render # final render
def update(self, data, depsgraph): def update(self, data, depsgraph):
# Note: if bl_use_gpu_context = True, leave this function empty and move engine creation
Brian Savery (AMD) commented 2023-07-07 19:05:06 +02:00
Outdated
Review
Copy Link

is bl_use_gpu_context is true why not just automatically use render()

Then say something here like "if use gpu context is true, this function is ignored and render() is used"

is bl_use_gpu_context is true why not just automatically use render() Then say something here like "if use gpu context is true, this function is ignored and render() is used"
# and syncing to render() function
engine_type = 'PREVIEW' if self.is_preview else 'FINAL' engine_type = 'PREVIEW' if self.is_preview else 'FINAL'
self.engine_ptr = _bpy_hydra.engine_create(self.as_pointer(), engine_type, self.delegate_id) self.engine_ptr = _bpy_hydra.engine_create(self.as_pointer(), engine_type, self.delegate_id)
if not self.engine_ptr: if not self.engine_ptr:

14
source/blender/render/hydra/final_engine.cc
View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: Apache-2.0 /* SPDX-License-Identifier: Apache-2.0
* Copyright 2011-2022 Blender Foundation */ * Copyright 2011-2022 Blender Foundation */
#include <pxr/imaging/glf/drawTarget.h> #include <pxr/imaging/garch/glApi.h>
#include <pxr/imaging/hd/light.h> #include <pxr/imaging/hd/light.h>
#include "BKE_lib_id.h" #include "BKE_lib_id.h"
@ -115,7 +115,7 @@ void FinalEngine::prepare_for_render(Depsgraph *depsgraph)
std::vector<float>(resolution_[0] * resolution_[1] * 4)); /* 4 - number of channels. */ std::vector<float>(resolution_[0] * resolution_[1] * 4)); /* 4 - number of channels. */
} }
void FinalEngineGL::render(Depsgraph *depsgraph) void FinalEngineGPU::render(Depsgraph *depsgraph)
{ {
prepare_for_render(depsgraph); prepare_for_render(depsgraph);
@ -155,10 +155,11 @@ void FinalEngineGL::render(Depsgraph *depsgraph)
} }
GPU_framebuffer_clear_color_depth(framebuffer, clear_color, 1.0f); GPU_framebuffer_clear_color_depth(framebuffer, clear_color, 1.0f);
// Generate vertex array /* Important: we have to create and bind at least one Vertex Array Object (VAO) before render
GLuint vao; execution: More info at https://open.gl/drawing */
glGenVertexArrays(1, &vao); GLuint VAO;
glBindVertexArray(vao); glGenVertexArrays(1, &VAO);
glBindVertexArray(VAO);
engine_->Execute(render_index_.get(), &tasks_); engine_->Execute(render_index_.get(), &tasks_);
@ -197,6 +198,7 @@ void FinalEngineGL::render(Depsgraph *depsgraph)
MEM_freeN(data); MEM_freeN(data);
update_render_result(); update_render_result();
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);

2
source/blender/render/hydra/final_engine.h
View File

@ -26,7 +26,7 @@ class FinalEngine : public Engine {
pxr::GfVec2i resolution_; pxr::GfVec2i resolution_;
}; };
class FinalEngineGL : public FinalEngine { class FinalEngineGPU : public FinalEngine {
public: public:
using FinalEngine::FinalEngine; using FinalEngine::FinalEngine;

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

@ -75,7 +75,7 @@ static PyObject *engine_create_func(PyObject * /*self*/, PyObject *args)
} }
else { else {
if (bl_engine->type->flag & RE_USE_GPU_CONTEXT) { if (bl_engine->type->flag & RE_USE_GPU_CONTEXT) {
engine = new FinalEngineGL(bl_engine, render_delegate_id); engine = new FinalEngineGPU(bl_engine, render_delegate_id);
} }
else { else {
engine = new FinalEngine(bl_engine, render_delegate_id); engine = new FinalEngine(bl_engine, render_delegate_id);