From 2316924b095c6be41b7b8e26569624580b1dd6ec Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Wed, 28 Mar 2018 13:00:55 -0600
Subject: [PATCH] Non-Functional: Remove merge-replicated code and fix white
space.
---
glslang/MachineIndependent/Intermediate.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 83d188e1a..1e02f4b70 100644
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -701,12 +701,6 @@ TIntermUnary* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped
// TODO: it seems that some unary folding operations should occur here, but are not
- // Propagate specialization-constant-ness, if allowed
- if (node->getType().getQualifier().isSpecConstant() && isSpecializationOperation(*newNode))
- newNode->getWritableType().getQualifier().makeSpecConstant();
-
- // TODO: it seems that some unary folding operations should occur here, but are not
-
// Propagate specialization-constant-ness, if allowed
if (node->getType().getQualifier().isSpecConstant() && isSpecializationOperation(*newNode))
newNode->getWritableType().getQualifier().makeSpecConstant();
@@ -1425,7 +1419,7 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_float32) ||
extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_float64);
- if(explicitTypesEnabled) {
+ if (explicitTypesEnabled) {
// integral promotions
if (isIntegralPromotion(from, to)) {
return true;
--
GitLab