Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
461ea099
Commit
461ea099
authored
Apr 11, 2018
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Non-functional: Fix tabs.
parent
e891afac
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
20 deletions
+20
-20
Common.h
glslang/Include/Common.h
+13
-13
revision.h
glslang/Include/revision.h
+1
-1
Versions.cpp
glslang/MachineIndependent/Versions.cpp
+4
-4
glslang.y
glslang/MachineIndependent/glslang.y
+0
-0
glslang_tab.cpp
glslang/MachineIndependent/glslang_tab.cpp
+0
-0
ShaderLang.h
glslang/Public/ShaderLang.h
+1
-1
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+1
-1
No files found.
glslang/Include/Common.h
View file @
461ea099
...
@@ -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)
...
...
glslang/Include/revision.h
View file @
461ea099
// This header is generated by the make-revision script.
// This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 26
89
#define GLSLANG_PATCH_LEVEL 26
91
glslang/MachineIndependent/Versions.cpp
View file @
461ea099
...
@@ -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
);
...
...
glslang/MachineIndependent/glslang.y
View file @
461ea099
This diff is collapsed.
Click to expand it.
glslang/MachineIndependent/glslang_tab.cpp
View file @
461ea099
This diff is collapsed.
Click to expand it.
glslang/Public/ShaderLang.h
View file @
461ea099
...
@@ -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)
...
...
hlsl/hlslParseHelper.cpp
View file @
461ea099
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment