Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typo in CommandBufferGl.cpp #20795

Open
wants to merge 1 commit into
base: v4
Choose a base branch
from
Open

Fix typo in CommandBufferGl.cpp #20795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions cocos/renderer/backend/opengl/CommandBufferGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,16 @@ void CommandBufferGL::beginFrame()
{
}

void CommandBufferGL::beginRenderPass(const RenderPassDescriptor& descirptor)
void CommandBufferGL::beginRenderPass(const RenderPassDescriptor& descriptor)
{
applyRenderPassDescriptor(descirptor);
applyRenderPassDescriptor(descriptor);
}

void CommandBufferGL::applyRenderPassDescriptor(const RenderPassDescriptor& descirptor)
void CommandBufferGL::applyRenderPassDescriptor(const RenderPassDescriptor& descriptor)
{
bool useColorAttachmentExternal = descirptor.needColorAttachment && descirptor.colorAttachmentsTexture[0];
bool useDepthAttachmentExternal = descirptor.depthTestEnabled && descirptor.depthAttachmentTexture;
bool useStencilAttachmentExternal = descirptor.stencilTestEnabled && descirptor.stencilAttachmentTexture;
bool useColorAttachmentExternal = descriptor.needColorAttachment && descriptor.colorAttachmentsTexture[0];
bool useDepthAttachmentExternal = descriptor.depthTestEnabled && descriptor.depthAttachmentTexture;
bool useStencilAttachmentExternal = descriptor.stencilTestEnabled && descriptor.stencilAttachmentTexture;
bool useGeneratedFBO = false;
if (useColorAttachmentExternal || useDepthAttachmentExternal || useStencilAttachmentExternal)
{
Expand All @@ -131,7 +131,7 @@ void CommandBufferGL::applyRenderPassDescriptor(const RenderPassDescriptor& desc
glFramebufferTexture2D(GL_FRAMEBUFFER,
GL_DEPTH_ATTACHMENT,
GL_TEXTURE_2D,
getHandler(descirptor.depthAttachmentTexture),
getHandler(descriptor.depthAttachmentTexture),
0);
CHECK_GL_ERROR_DEBUG();

Expand All @@ -157,7 +157,7 @@ void CommandBufferGL::applyRenderPassDescriptor(const RenderPassDescriptor& desc
glFramebufferTexture2D(GL_FRAMEBUFFER,
GL_STENCIL_ATTACHMENT,
GL_TEXTURE_2D,
getHandler(descirptor.depthAttachmentTexture),
getHandler(descriptor.depthAttachmentTexture),
0);
CHECK_GL_ERROR_DEBUG();

Expand All @@ -178,10 +178,10 @@ void CommandBufferGL::applyRenderPassDescriptor(const RenderPassDescriptor& desc
}
}

if (descirptor.needColorAttachment)
if (descriptor.needColorAttachment)
{
int i = 0;
for (const auto& texture : descirptor.colorAttachmentsTexture)
for (const auto& texture : descriptor.colorAttachmentsTexture)
{
if (texture)
{
Expand Down Expand Up @@ -243,10 +243,10 @@ void CommandBufferGL::applyRenderPassDescriptor(const RenderPassDescriptor& desc

// set clear color, depth and stencil
GLbitfield mask = 0;
if (descirptor.needClearColor)
if (descriptor.needClearColor)
{
mask |= GL_COLOR_BUFFER_BIT;
const auto& clearColor = descirptor.clearColorValue;
const auto& clearColor = descriptor.clearColorValue;
glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
}

Expand All @@ -256,34 +256,34 @@ void CommandBufferGL::applyRenderPassDescriptor(const RenderPassDescriptor& desc
GLboolean oldDepthTest = GL_FALSE;
GLfloat oldDepthClearValue = 0.f;
GLint oldDepthFunc = GL_LESS;
if (descirptor.needClearDepth)
if (descriptor.needClearDepth)
{
glGetBooleanv(GL_DEPTH_WRITEMASK, &oldDepthWrite);
glGetBooleanv(GL_DEPTH_TEST, &oldDepthTest);
glGetFloatv(GL_DEPTH_CLEAR_VALUE, &oldDepthClearValue);
glGetIntegerv(GL_DEPTH_FUNC, &oldDepthFunc);

mask |= GL_DEPTH_BUFFER_BIT;
glClearDepth(descirptor.clearDepthValue);
glClearDepth(descriptor.clearDepthValue);
glEnable(GL_DEPTH_TEST);
glDepthMask(GL_TRUE);
glDepthFunc(GL_ALWAYS);
}

CHECK_GL_ERROR_DEBUG();

if (descirptor.needClearStencil)
if (descriptor.needClearStencil)
{
mask |= GL_STENCIL_BUFFER_BIT;
glClearStencil(descirptor.clearStencilValue);
glClearStencil(descriptor.clearStencilValue);
}

if(mask) glClear(mask);

CHECK_GL_ERROR_DEBUG();

// restore depth test
if (descirptor.needClearDepth)
if (descriptor.needClearDepth)
{
if (!oldDepthTest)
glDisable(GL_DEPTH_TEST);
Expand Down
Loading