aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInho Lee <inho.lee@qt.io>2020-09-18 13:09:16 +0200
committerInho Lee <inho.lee@qt.io>2020-10-02 10:16:49 +0200
commit82a2d34faa7c7fa2f3fcfce145d375d5edce4fef (patch)
treeb4498044718db9d28a1ce119f9a527b5e0dda316
parentdc4f911e8c490633a3fe62b52e821d4abbece45e (diff)
Fix warnings in the PricipledMaterialv6.0.0-alpha1
Change-Id: I8b88e407799e6d31af5879388cd598d9755fba15 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--src/runtimerender/qssgrenderdefaultmaterialshadergenerator.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/runtimerender/qssgrenderdefaultmaterialshadergenerator.cpp b/src/runtimerender/qssgrenderdefaultmaterialshadergenerator.cpp
index ec846ac7..aadd4db7 100644
--- a/src/runtimerender/qssgrenderdefaultmaterialshadergenerator.cpp
+++ b/src/runtimerender/qssgrenderdefaultmaterialshadergenerator.cpp
@@ -431,7 +431,6 @@ static void generateFragmentShader(QSSGStageGeneratorBase &fragmentShader,
bool specularLightingEnabled = metalnessEnabled || materialAdapter->isSpecularEnabled() || hasIblProbe;
bool hasEmissiveMap = false;
bool hasLightmaps = false;
- bool hasBaseColorMap = false;
// Pull the bump out as
QSSGRenderableImage *bumpImage = nullptr;
quint32 imageIdx = 0;
@@ -479,7 +478,6 @@ static void generateFragmentShader(QSSGStageGeneratorBase &fragmentShader,
if (img->m_image.isImageTransformIdentity())
identityImages.push_back(img);
if (img->m_mapType == QSSGRenderableImage::Type::BaseColor || img->m_mapType == QSSGRenderableImage::Type::Diffuse) {
- hasBaseColorMap = img->m_mapType == QSSGRenderableImage::Type::BaseColor;
baseImage = img;
} else if (img->m_mapType == QSSGRenderableImage::Type::Bump) {
bumpImage = img;
@@ -542,7 +540,6 @@ static void generateFragmentShader(QSSGStageGeneratorBase &fragmentShader,
specularLightingEnabled = false;
vertexColorsEnabled = false;
- hasBaseColorMap = false;
baseImage = nullptr;
includeCustomFragmentMain = false;