From 4eae48fe4e59e5b2e4bec01d014a17f7db2dbf80 Mon Sep 17 00:00:00 2001 From: coulsonwang Date: Tue, 3 Dec 2019 13:56:25 +0800 Subject: [PATCH] fix basic triangle test (#1962) --- native/cocos/renderer/core/gfx/GFXBuffer.h | 2 +- native/cocos/renderer/core/gfx/GFXDevice.h | 2 ++ .../renderer/gfx-gles2/GLES2CommandBuffer.cc | 14 +++++++--- .../cocos/renderer/gfx-gles2/GLES2Device.cc | 27 +++++++++++++++++++ native/cocos/renderer/gfx-gles2/GLES2Device.h | 2 ++ .../renderer/gfx-gles2/GLES2GPUObjects.h | 4 +-- .../cocos/renderer/gfx-gles2/GLES2Shader.cc | 9 +++++++ .../cocos/renderer/gfx-gles3/GLES3Device.cc | 27 +++++++++++++++++++ native/cocos/renderer/gfx-gles3/GLES3Device.h | 2 ++ 9 files changed, 83 insertions(+), 6 deletions(-) diff --git a/native/cocos/renderer/core/gfx/GFXBuffer.h b/native/cocos/renderer/core/gfx/GFXBuffer.h index e2a7ec0337..46128493b3 100755 --- a/native/cocos/renderer/core/gfx/GFXBuffer.h +++ b/native/cocos/renderer/core/gfx/GFXBuffer.h @@ -33,7 +33,7 @@ class CC_CORE_API GFXBuffer : public Object { uint count_; uint size_; GFXBufferFlags flags_; - uint8_t* buffer_; + uint8_t* buffer_ = nullptr; }; NS_CC_END diff --git a/native/cocos/renderer/core/gfx/GFXDevice.h b/native/cocos/renderer/core/gfx/GFXDevice.h index 1cafd1c298..cfb1faa8d5 100755 --- a/native/cocos/renderer/core/gfx/GFXDevice.h +++ b/native/cocos/renderer/core/gfx/GFXDevice.h @@ -28,6 +28,8 @@ class CC_CORE_API GFXDevice : public Object { virtual GFXRenderPass* CreateGFXRenderPass(const GFXRenderPassInfo& info) = 0; virtual GFXFramebuffer* CreateGFXFramebuffer(const GFXFramebufferInfo& info) = 0; virtual GFXBindingLayout* CreateGFXBindingLayout(const GFXBindingLayoutInfo& info) = 0; + virtual GFXPipelineState* CreateGFXPipelineState(const GFXPipelineStateInfo& info) = 0; + virtual GFXPipelineLayout* CreateGFXPipelieLayout(const GFXPipelineLayoutInfo& info) = 0; CC_INLINE GFXAPI api() const { return api_; } CC_INLINE GFXMemoryStatus& mem_status() { return mem_status_; } diff --git a/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cc b/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cc index d41054b4c2..6a13f005da 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cc +++ b/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cc @@ -203,13 +203,21 @@ void GLES2CommandBuffer::Draw(GFXInputAssembler* ia) { ++num_draw_calls_; if(cur_gpu_pso_) { switch (cur_gpu_pso_->gl_primitive) { - case GL_TRIANGLES: { - num_tris_ += ia->index_count() / 3 * std::max(ia->instance_count(), 1U); + case GL_TRIANGLES: + { + if (ia->index_buffer() == nullptr) + { + num_tris_ += ia->vertex_count() / 3 * std::max(ia->instance_count(), 1U); + } + else + { + num_tris_ += ia->index_count() / 3 * std::max(ia->instance_count(), 1U); + } break; } case GL_TRIANGLE_STRIP: case GL_TRIANGLE_FAN: { - num_tris_ += (ia->index_count() - 2) * std::max(ia->instance_count(), 1U); + num_tris_ += (ia->vertex_count() - 2) * std::max(ia->instance_count(), 1U); break; } default: diff --git a/native/cocos/renderer/gfx-gles2/GLES2Device.cc b/native/cocos/renderer/gfx-gles2/GLES2Device.cc index 2b43093570..d5e17f842b 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2Device.cc +++ b/native/cocos/renderer/gfx-gles2/GLES2Device.cc @@ -15,6 +15,8 @@ #include "GLES2RenderPass.h" #include "GLES2Framebuffer.h" #include "GLES2BindingLayout.h" +#include "GLES2PipelineLayout.h" +#include "GLES2PipelineState.h" NS_CC_BEGIN @@ -267,4 +269,29 @@ GFXBindingLayout* GLES2Device::CreateGFXBindingLayout(const GFXBindingLayoutInfo } } + + +GFXPipelineState* GLES2Device::CreateGFXPipelineState(const GFXPipelineStateInfo& info) +{ + GFXPipelineState* pipelineState = CC_NEW(GLES2PipelineState(this)); + if (pipelineState->Initialize(info)) + { + return pipelineState; + } + + CC_SAFE_DESTROY(pipelineState); + return nullptr; +} + +GFXPipelineLayout* GLES2Device::CreateGFXPipelieLayout(const GFXPipelineLayoutInfo& info) +{ + GFXPipelineLayout* layout = CC_NEW(GLES2PipelineLayout(this)); + if (layout->Initialize(info)) + { + return layout; + } + + CC_SAFE_DESTROY(layout); + return nullptr; +} NS_CC_END diff --git a/native/cocos/renderer/gfx-gles2/GLES2Device.h b/native/cocos/renderer/gfx-gles2/GLES2Device.h index b9c1c948d9..33c23af5ad 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2Device.h +++ b/native/cocos/renderer/gfx-gles2/GLES2Device.h @@ -30,6 +30,8 @@ public: GFXRenderPass* CreateGFXRenderPass(const GFXRenderPassInfo& info); GFXFramebuffer* CreateGFXFramebuffer(const GFXFramebufferInfo& info); GFXBindingLayout* CreateGFXBindingLayout(const GFXBindingLayoutInfo& info); + virtual GFXPipelineState* CreateGFXPipelineState(const GFXPipelineStateInfo& info) override; + virtual GFXPipelineLayout* CreateGFXPipelieLayout(const GFXPipelineLayoutInfo& info) override; CC_INLINE bool use_vao() const { return use_vao_; } CC_INLINE bool use_draw_instanced() const { return use_draw_instanced_; } diff --git a/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h b/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h index 1a89c2ffd1..6f61e61fc5 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h +++ b/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h @@ -163,8 +163,8 @@ class GLES2GPUInputAssembler : public Object { public: GFXAttributeList attribs; GLES2GPUBufferList gpu_vertex_buffers; - GLES2GPUBuffer* gpu_index_buffer; - GLES2GPUBuffer* gpu_indirect_buffer; + GLES2GPUBuffer* gpu_index_buffer = nullptr; + GLES2GPUBuffer* gpu_indirect_buffer = nullptr; GLES2GPUAttributeList gpu_attribs; GLenum gl_index_type; map::type gl_vaos; diff --git a/native/cocos/renderer/gfx-gles2/GLES2Shader.cc b/native/cocos/renderer/gfx-gles2/GLES2Shader.cc index 795def654e..e2ae045175 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2Shader.cc +++ b/native/cocos/renderer/gfx-gles2/GLES2Shader.cc @@ -19,6 +19,15 @@ bool GLES2Shader::Initialize(const GFXShaderInfo &info) { samplers_ = info.samplers; gpu_shader_ = CC_NEW(GLES2GPUShader); + gpu_shader_->name = name_; + gpu_shader_->blocks = blocks_; + gpu_shader_->samplers = samplers_; + for (const auto& stage : stages_) + { + GLES2GPUShaderStage gpuShaderStage = { stage.type, stage.source, stage.macros, 0}; + gpu_shader_->gpu_stages.emplace_back(std::move(gpuShaderStage)); + } + GLES2CmdFuncCreateShader((GLES2Device*)device_, gpu_shader_); return true; diff --git a/native/cocos/renderer/gfx-gles3/GLES3Device.cc b/native/cocos/renderer/gfx-gles3/GLES3Device.cc index 76e10780c1..08b17c0802 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3Device.cc +++ b/native/cocos/renderer/gfx-gles3/GLES3Device.cc @@ -15,6 +15,8 @@ #include "GLES3RenderPass.h" #include "GLES3Framebuffer.h" #include "GLES3BindingLayout.h" +#include "GLES3PipelineLayout.h" +#include "GLES3PipelineState.h" NS_CC_BEGIN @@ -259,4 +261,29 @@ GFXBindingLayout* GLES3Device::CreateGFXBindingLayout(const GFXBindingLayoutInfo } } + +GFXPipelineState* GLES3Device::CreateGFXPipelineState(const GFXPipelineStateInfo& info) +{ + GFXPipelineState* pipelineState = CC_NEW(GLES3PipelineState(this)); + if (pipelineState->Initialize(info)) + { + return pipelineState; + } + + CC_SAFE_DESTROY(pipelineState); + return nullptr; +} + +GFXPipelineLayout* GLES3Device::CreateGFXPipelieLayout(const GFXPipelineLayoutInfo& info) +{ + GFXPipelineLayout* layout = CC_NEW(GLES3PipelineLayout(this)); + if (layout->Initialize(info)) + { + return layout; + } + + CC_SAFE_DESTROY(layout); + return nullptr; +} + NS_CC_END diff --git a/native/cocos/renderer/gfx-gles3/GLES3Device.h b/native/cocos/renderer/gfx-gles3/GLES3Device.h index 36c6390304..b02108941e 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3Device.h +++ b/native/cocos/renderer/gfx-gles3/GLES3Device.h @@ -30,6 +30,8 @@ public: GFXRenderPass* CreateGFXRenderPass(const GFXRenderPassInfo& info); GFXFramebuffer* CreateGFXFramebuffer(const GFXFramebufferInfo& info); GFXBindingLayout* CreateGFXBindingLayout(const GFXBindingLayoutInfo& info); + virtual GFXPipelineState* CreateGFXPipelineState(const GFXPipelineStateInfo& info) override; + virtual GFXPipelineLayout* CreateGFXPipelieLayout(const GFXPipelineLayoutInfo& info) override; CC_INLINE bool use_vao() const { return use_vao_; }