From fd30542a0fe84aae441f9677d97693aacea59c90 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Thu, 5 Jun 2014 16:30:53 +0000
Subject: [PATCH] Non-functional trivial clean up.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26972 e7fa87d3-cd2b-0410-9028-fcbf551c1848
---
StandAlone/CMakeLists.txt | 4 ++--
StandAlone/StandAlone.cpp | 4 ++--
glslang/Public/ShaderLang.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index 29022315f..4c60c4a19 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8)
include_directories(.)
if(WIN32)
- include_directories(${include_directories} ../glslang/OSDependent/Windows)
+ include_directories(../glslang/OSDependent/Windows)
elseif(UNIX)
- include_directories(${include_directories} ../glslang/OSDependent/Linux)
+ include_directories(../glslang/OSDependent/Linux)
else(WIN32)
message("unkown platform")
endif(WIN32)
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index da6f10a35..10da8e16d 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -428,7 +428,7 @@ void ProcessConfigFile()
glslang::TWorklist Worklist;
// array of unique places to leave the shader names and infologs for the asynchronous compiles
-glslang::TWorkItem **Work = 0;
+glslang::TWorkItem** Work = 0;
int NumWorkItems = 0;
int Options = 0;
@@ -455,7 +455,7 @@ bool ProcessArguments(int argc, char* argv[])
{
ExecutableName = argv[0];
NumWorkItems = argc; // will include some empties where the '-' options were, but it doesn't matter, they'll be 0
- Work = new glslang::TWorkItem*[NumWorkItems];
+ Work = new glslang::TWorkItem*[NumWorkItems];
Work[0] = 0;
argc--;
diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
index b5cd58e80..4ca1c0d54 100644
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -190,7 +190,7 @@ SH_IMPORT_EXPORT int ShLink(
const int numHandles,
ShHandle uniformMap, // updated with new uniforms
short int** uniformsAccessed, // returned with indexes of uniforms accessed
- int* numUniformsAccessed);
+ int* numUniformsAccessed);
SH_IMPORT_EXPORT int ShLinkExt(
const ShHandle, // linker object
--
GitLab