From 0d6578403ec7501dca55dfc81708df665fbda060 Mon Sep 17 00:00:00 2001 From: mmyduckx <308303735@qq.com> Date: Thu, 15 Apr 2021 18:33:45 +0800 Subject: [PATCH] treat gles3 warning as error (#3408) * treat gles3 warning as error --- native/CMakeLists.txt | 42 +++++++++---------- .../renderer/gfx-gles3/GLES3Commands.cpp | 7 +--- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 4db64e3fa6..de10ffeddd 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -807,7 +807,7 @@ cocos_source_files( cocos/renderer/gfx-gles-common/GLESCommandPool.h NO_WERROR cocos/renderer/gfx-gles-common/eglw.cpp NO_WERROR cocos/renderer/gfx-gles-common/gles2w.cpp - NO_WERROR cocos/renderer/gfx-gles-common/gles3w.cpp + cocos/renderer/gfx-gles-common/gles3w.cpp ) endif() @@ -873,44 +873,44 @@ endif() if(CC_USE_GLES3) cocos_source_files( cocos/renderer/gfx-gles3/GFXGLES3.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Buffer.cpp + cocos/renderer/gfx-gles3/GLES3Buffer.cpp cocos/renderer/gfx-gles3/GLES3Buffer.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3CommandBuffer.cpp + cocos/renderer/gfx-gles3/GLES3CommandBuffer.cpp cocos/renderer/gfx-gles3/GLES3CommandBuffer.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Commands.cpp + cocos/renderer/gfx-gles3/GLES3Commands.cpp cocos/renderer/gfx-gles3/GLES3Commands.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Context.cpp + cocos/renderer/gfx-gles3/GLES3Context.cpp cocos/renderer/gfx-gles3/GLES3Context.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Device.cpp + cocos/renderer/gfx-gles3/GLES3Device.cpp cocos/renderer/gfx-gles3/GLES3Device.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Framebuffer.cpp + cocos/renderer/gfx-gles3/GLES3Framebuffer.cpp cocos/renderer/gfx-gles3/GLES3Framebuffer.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3GlobalBarrier.cpp + cocos/renderer/gfx-gles3/GLES3GlobalBarrier.cpp cocos/renderer/gfx-gles3/GLES3GlobalBarrier.h cocos/renderer/gfx-gles3/GLES3GPUObjects.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3InputAssembler.cpp + cocos/renderer/gfx-gles3/GLES3InputAssembler.cpp cocos/renderer/gfx-gles3/GLES3InputAssembler.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3DescriptorSet.cpp + cocos/renderer/gfx-gles3/GLES3DescriptorSet.cpp cocos/renderer/gfx-gles3/GLES3DescriptorSet.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3DescriptorSetLayout.cpp + cocos/renderer/gfx-gles3/GLES3DescriptorSetLayout.cpp cocos/renderer/gfx-gles3/GLES3DescriptorSetLayout.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3PipelineLayout.cpp + cocos/renderer/gfx-gles3/GLES3PipelineLayout.cpp cocos/renderer/gfx-gles3/GLES3PipelineLayout.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3PipelineState.cpp + cocos/renderer/gfx-gles3/GLES3PipelineState.cpp cocos/renderer/gfx-gles3/GLES3PipelineState.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3PrimaryCommandBuffer.cpp + cocos/renderer/gfx-gles3/GLES3PrimaryCommandBuffer.cpp cocos/renderer/gfx-gles3/GLES3PrimaryCommandBuffer.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Queue.cpp + cocos/renderer/gfx-gles3/GLES3Queue.cpp cocos/renderer/gfx-gles3/GLES3Queue.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3RenderPass.cpp + cocos/renderer/gfx-gles3/GLES3RenderPass.cpp cocos/renderer/gfx-gles3/GLES3RenderPass.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Sampler.cpp + cocos/renderer/gfx-gles3/GLES3Sampler.cpp cocos/renderer/gfx-gles3/GLES3Sampler.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Shader.cpp + cocos/renderer/gfx-gles3/GLES3Shader.cpp cocos/renderer/gfx-gles3/GLES3Shader.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Std.cpp + cocos/renderer/gfx-gles3/GLES3Std.cpp cocos/renderer/gfx-gles3/GLES3Std.h - NO_WERROR cocos/renderer/gfx-gles3/GLES3Texture.cpp + cocos/renderer/gfx-gles3/GLES3Texture.cpp cocos/renderer/gfx-gles3/GLES3Texture.h cocos/renderer/gfx-gles3/GLES3Wrangler.h ) @@ -920,7 +920,7 @@ if(CC_USE_GLES3) ) else() cocos_source_files( - NO_WERROR cocos/renderer/gfx-gles3/GLES3Wrangler.cpp + cocos/renderer/gfx-gles3/GLES3Wrangler.cpp ) endif() if(IOS) diff --git a/native/cocos/renderer/gfx-gles3/GLES3Commands.cpp b/native/cocos/renderer/gfx-gles3/GLES3Commands.cpp index 0689b21f15..8e20c8fe2e 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3Commands.cpp +++ b/native/cocos/renderer/gfx-gles3/GLES3Commands.cpp @@ -1372,7 +1372,6 @@ void cmdFuncGLES3DestroyShader(GLES3Device *device, GLES3GPUShader *gpuShader) { } void cmdFuncGLES3CreateInputAssembler(GLES3Device *device, GLES3GPUInputAssembler *gpuInputAssembler) { - if (gpuInputAssembler->gpuIndexBuffer) { switch (gpuInputAssembler->gpuIndexBuffer->stride) { case 1: gpuInputAssembler->glIndexType = GL_UNSIGNED_BYTE; break; @@ -1781,7 +1780,7 @@ void cmdFuncGLES3BindState(GLES3Device *device, GLES3GPUPipelineState *gpuPipeli cache->rs.cullMode = gpuPipelineState->rs.cullMode; } bool isFrontFaceCCW = gpuPipelineState->rs.isFrontFaceCCW != gfxStateCache.reverseCW; - if (cache->rs.isFrontFaceCCW != isFrontFaceCCW) { + if (static_cast(cache->rs.isFrontFaceCCW) != isFrontFaceCCW) { GL_CHECK(glFrontFace(isFrontFaceCCW ? GL_CCW : GL_CW)); cache->rs.isFrontFaceCCW = isFrontFaceCCW; } @@ -1893,7 +1892,6 @@ void cmdFuncGLES3BindState(GLES3Device *device, GLES3GPUPipelineState *gpuPipeli cache->bs.blendColor.y != gpuPipelineState->bs.blendColor.y || cache->bs.blendColor.z != gpuPipelineState->bs.blendColor.z || cache->bs.blendColor.w != gpuPipelineState->bs.blendColor.w) { - GL_CHECK(glBlendColor(gpuPipelineState->bs.blendColor.x, gpuPipelineState->bs.blendColor.y, gpuPipelineState->bs.blendColor.z, @@ -1942,7 +1940,6 @@ void cmdFuncGLES3BindState(GLES3Device *device, GLES3GPUPipelineState *gpuPipeli // bind descriptor sets if (gpuPipelineState && gpuPipelineState->gpuShader && gpuPipelineState->gpuPipelineLayout) { - const vector> &dynamicOffsetIndices = gpuPipelineState->gpuPipelineLayout->dynamicOffsetIndices; size_t bufferLen = gpuPipelineState->gpuShader->glBuffers.size(); @@ -2176,7 +2173,7 @@ void cmdFuncGLES3BindState(GLES3Device *device, GLES3GPUPipelineState *gpuPipeli } break; case DynamicStateFlagBit::DEPTH_BIAS: - if (cache->rs.depthBiasEnabled != depthBiasEnabled) { + if (static_cast(cache->rs.depthBiasEnabled) != depthBiasEnabled) { if (depthBiasEnabled) { GL_CHECK(glEnable(GL_POLYGON_OFFSET_FILL)); } else {