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
48f08c60
Commit
48f08c60
authored
Mar 16, 2021
by
Malcolm Bechard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix variable capitilization. Don't initialize it in the struct's constructor
parent
b2e5b5c5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
ShaderLang.cpp
glslang/MachineIndependent/ShaderLang.cpp
+2
-1
ShaderLang.h
glslang/Public/ShaderLang.h
+3
-3
No files found.
glslang/MachineIndependent/ShaderLang.cpp
View file @
48f08c60
...
...
@@ -727,7 +727,7 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages
break
;
case
EShClientVulkan
:
spvVersion
.
vulkanGlsl
=
environment
->
input
.
dialectVersion
;
spvVersion
.
vulkanRelaxed
=
environment
->
input
.
V
ulkanRulesRelaxed
;
spvVersion
.
vulkanRelaxed
=
environment
->
input
.
v
ulkanRulesRelaxed
;
break
;
case
EShClientOpenGL
:
spvVersion
.
openGl
=
environment
->
input
.
dialectVersion
;
...
...
@@ -1767,6 +1767,7 @@ TShader::TShader(EShLanguage s)
// clear environment (avoid constructors in them for use in a C interface)
environment
.
input
.
languageFamily
=
EShSourceNone
;
environment
.
input
.
dialect
=
EShClientNone
;
environment
.
input
.
vulkanRulesRelaxed
=
false
;
environment
.
client
.
client
=
EShClientNone
;
environment
.
target
.
language
=
EShTargetNone
;
environment
.
target
.
hlslFunctionality1
=
false
;
...
...
glslang/Public/ShaderLang.h
View file @
48f08c60
...
...
@@ -187,7 +187,7 @@ struct TInputLanguage {
EShLanguage
stage
;
// redundant information with other input, this one overrides when not EShSourceNone
EShClient
dialect
;
int
dialectVersion
;
// version of client's language definition, not the client (when not EShClientNone)
bool
VulkanRulesRelaxed
=
false
;
bool
vulkanRulesRelaxed
;
};
struct
TClient
{
...
...
@@ -556,8 +556,8 @@ public:
bool
getEnvTargetHlslFunctionality1
()
const
{
return
false
;
}
#endif
void
setEnvInputVulkanRulesRelaxed
()
{
environment
.
input
.
V
ulkanRulesRelaxed
=
true
;
}
bool
getEnvInputVulkanRulesRelaxed
()
const
{
return
environment
.
input
.
V
ulkanRulesRelaxed
;
}
void
setEnvInputVulkanRulesRelaxed
()
{
environment
.
input
.
v
ulkanRulesRelaxed
=
true
;
}
bool
getEnvInputVulkanRulesRelaxed
()
const
{
return
environment
.
input
.
v
ulkanRulesRelaxed
;
}
// Interface to #include handlers.
//
...
...
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