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
7cec64fc
Commit
7cec64fc
authored
Mar 22, 2018
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Non functional: add EshTargetClientVersion alias for EShTargetClientVersion.
Fixes #1304.
parent
97e35420
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
StandAlone.cpp
StandAlone/StandAlone.cpp
+2
-2
ShaderLang.h
glslang/Public/ShaderLang.h
+5
-3
TestFixture.h
gtests/TestFixture.h
+2
-2
No files found.
StandAlone/StandAlone.cpp
View file @
7cec64fc
...
@@ -160,9 +160,9 @@ const char* variableName = nullptr;
...
@@ -160,9 +160,9 @@ const char* variableName = nullptr;
bool
HlslEnable16BitTypes
=
false
;
bool
HlslEnable16BitTypes
=
false
;
std
::
vector
<
std
::
string
>
IncludeDirectoryList
;
std
::
vector
<
std
::
string
>
IncludeDirectoryList
;
int
ClientInputSemanticsVersion
=
100
;
// maps to, say, #define VULKAN 100
int
ClientInputSemanticsVersion
=
100
;
// maps to, say, #define VULKAN 100
glslang
::
E
s
hTargetClientVersion
VulkanClientVersion
=
glslang
::
E
S
hTargetClientVersion
VulkanClientVersion
=
glslang
::
EShTargetVulkan_1_0
;
// would map to, say, Vulkan 1.0
glslang
::
EShTargetVulkan_1_0
;
// would map to, say, Vulkan 1.0
glslang
::
E
s
hTargetClientVersion
OpenGLClientVersion
=
glslang
::
E
S
hTargetClientVersion
OpenGLClientVersion
=
glslang
::
EShTargetOpenGL_450
;
// doesn't influence anything yet, but maps to OpenGL 4.50
glslang
::
EShTargetOpenGL_450
;
// doesn't influence anything yet, but maps to OpenGL 4.50
glslang
::
EShTargetLanguageVersion
TargetVersion
=
glslang
::
EShTargetLanguageVersion
TargetVersion
=
glslang
::
EShTargetSpv_1_0
;
// maps to, say, SPIR-V 1.0
glslang
::
EShTargetSpv_1_0
;
// maps to, say, SPIR-V 1.0
...
...
glslang/Public/ShaderLang.h
View file @
7cec64fc
...
@@ -132,7 +132,9 @@ typedef enum {
...
@@ -132,7 +132,9 @@ typedef enum {
EShTargetVulkan_1_0
=
(
1
<<
22
),
EShTargetVulkan_1_0
=
(
1
<<
22
),
EShTargetVulkan_1_1
=
(
1
<<
22
)
|
(
1
<<
12
),
EShTargetVulkan_1_1
=
(
1
<<
22
)
|
(
1
<<
12
),
EShTargetOpenGL_450
=
450
,
EShTargetOpenGL_450
=
450
,
}
EshTargetClientVersion
;
}
EShTargetClientVersion
;
typedef
EShTargetClientVersion
EshTargetClientVersion
;
typedef
enum
{
typedef
enum
{
EShTargetSpv_1_0
=
(
1
<<
16
),
EShTargetSpv_1_0
=
(
1
<<
16
),
...
@@ -148,7 +150,7 @@ struct TInputLanguage {
...
@@ -148,7 +150,7 @@ struct TInputLanguage {
struct
TClient
{
struct
TClient
{
EShClient
client
;
EShClient
client
;
E
s
hTargetClientVersion
version
;
// version of client itself (not the client's input dialect)
E
S
hTargetClientVersion
version
;
// version of client itself (not the client's input dialect)
};
};
struct
TTarget
{
struct
TTarget
{
...
@@ -411,7 +413,7 @@ public:
...
@@ -411,7 +413,7 @@ public:
environment
.
input
.
dialect
=
client
;
environment
.
input
.
dialect
=
client
;
environment
.
input
.
dialectVersion
=
version
;
environment
.
input
.
dialectVersion
=
version
;
}
}
void
setEnvClient
(
EShClient
client
,
E
s
hTargetClientVersion
version
)
void
setEnvClient
(
EShClient
client
,
E
S
hTargetClientVersion
version
)
{
{
environment
.
client
.
client
=
client
;
environment
.
client
.
client
=
client
;
environment
.
client
.
version
=
version
;
environment
.
client
.
version
=
version
;
...
...
gtests/TestFixture.h
View file @
7cec64fc
...
@@ -197,7 +197,7 @@ public:
...
@@ -197,7 +197,7 @@ public:
GlslangResult
compileAndLink
(
GlslangResult
compileAndLink
(
const
std
::
string
shaderName
,
const
std
::
string
&
code
,
const
std
::
string
shaderName
,
const
std
::
string
&
code
,
const
std
::
string
&
entryPointName
,
EShMessages
controls
,
const
std
::
string
&
entryPointName
,
EShMessages
controls
,
glslang
::
E
s
hTargetClientVersion
clientTargetVersion
,
glslang
::
E
S
hTargetClientVersion
clientTargetVersion
,
bool
flattenUniformArrays
=
false
,
bool
flattenUniformArrays
=
false
,
EShTextureSamplerTransformMode
texSampTransMode
=
EShTexSampTransKeep
,
EShTextureSamplerTransformMode
texSampTransMode
=
EShTexSampTransKeep
,
bool
disableOptimizer
=
true
,
bool
disableOptimizer
=
true
,
...
@@ -407,7 +407,7 @@ public:
...
@@ -407,7 +407,7 @@ public:
const
std
::
string
&
testName
,
const
std
::
string
&
testName
,
Source
source
,
Source
source
,
Semantics
semantics
,
Semantics
semantics
,
glslang
::
E
s
hTargetClientVersion
clientTargetVersion
,
glslang
::
E
S
hTargetClientVersion
clientTargetVersion
,
Target
target
,
Target
target
,
bool
automap
=
true
,
bool
automap
=
true
,
const
std
::
string
&
entryPointName
=
""
,
const
std
::
string
&
entryPointName
=
""
,
...
...
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