mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
fix basic triangle test (#1962)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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_; }
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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_; }
|
||||
|
||||
@@ -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<GLuint, GLuint>::type gl_vaos;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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_; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user