Commit 461ea099 by John Kessenich

Non-functional: Fix tabs.

parent e891afac
...@@ -67,19 +67,19 @@ std::string to_string(const T& val) { ...@@ -67,19 +67,19 @@ std::string to_string(const T& val) {
#endif #endif
#if defined(_MSC_VER) && _MSC_VER < 1800 #if defined(_MSC_VER) && _MSC_VER < 1800
#include <stdlib.h> #include <stdlib.h>
inline long long int strtoll (const char* str, char** endptr, int base) inline long long int strtoll (const char* str, char** endptr, int base)
{ {
return _strtoi64(str, endptr, base); return _strtoi64(str, endptr, base);
} }
inline unsigned long long int strtoull (const char* str, char** endptr, int base) inline unsigned long long int strtoull (const char* str, char** endptr, int base)
{ {
return _strtoui64(str, endptr, base); return _strtoui64(str, endptr, base);
} }
inline long long int atoll (const char* str) inline long long int atoll (const char* str)
{ {
return strtoll(str, NULL, 10); return strtoll(str, NULL, 10);
} }
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
......
// This header is generated by the make-revision script. // This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 2689 #define GLSLANG_PATCH_LEVEL 2691
...@@ -892,12 +892,12 @@ void TParseVersions::explicitInt16Check(const TSourceLoc& loc, const char* op, b ...@@ -892,12 +892,12 @@ void TParseVersions::explicitInt16Check(const TSourceLoc& loc, const char* op, b
{ {
if (! builtIn) { if (! builtIn) {
#if AMD_EXTENSIONS #if AMD_EXTENSIONS
const char* const extensions[3] = {E_GL_AMD_gpu_shader_int16, const char* const extensions[3] = {E_GL_AMD_gpu_shader_int16,
E_GL_KHX_shader_explicit_arithmetic_types, E_GL_KHX_shader_explicit_arithmetic_types,
E_GL_KHX_shader_explicit_arithmetic_types_int16}; E_GL_KHX_shader_explicit_arithmetic_types_int16};
#else #else
const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types, const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
E_GL_KHX_shader_explicit_arithmetic_types_int16}; E_GL_KHX_shader_explicit_arithmetic_types_int16};
#endif #endif
requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types"); requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types");
requireProfile(loc, ECoreProfile | ECompatibilityProfile, op); requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
......
...@@ -671,7 +671,7 @@ public: ...@@ -671,7 +671,7 @@ public:
int getUniformBlockSize(int blockIndex) const; // can be used for glGetActiveUniformBlockiv(UNIFORM_BLOCK_DATA_SIZE) int getUniformBlockSize(int blockIndex) const; // can be used for glGetActiveUniformBlockiv(UNIFORM_BLOCK_DATA_SIZE)
int getUniformIndex(const char* name) const; // can be used for glGetUniformIndices() int getUniformIndex(const char* name) const; // can be used for glGetUniformIndices()
int getUniformBinding(int index) const; // returns the binding number int getUniformBinding(int index) const; // returns the binding number
int getUniformBlockBinding(int index) const; // returns the block binding number int getUniformBlockBinding(int index) const; // returns the block binding number
int getUniformBlockIndex(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_BLOCK_INDEX) int getUniformBlockIndex(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_BLOCK_INDEX)
int getUniformBlockCounterIndex(int index) const; // returns block index of associated counter. int getUniformBlockCounterIndex(int index) const; // returns block index of associated counter.
int getUniformType(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_TYPE) int getUniformType(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_TYPE)
......
...@@ -8629,7 +8629,7 @@ void HlslParseContext::declareBlock(const TSourceLoc& loc, TType& type, const TS ...@@ -8629,7 +8629,7 @@ void HlslParseContext::declareBlock(const TSourceLoc& loc, TType& type, const TS
return; return;
} }
// Save it in the AST for linker use. // Save it in the AST for linker use.
if (symbolTable.atGlobalLevel()) if (symbolTable.atGlobalLevel())
trackLinkage(variable); trackLinkage(variable);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment