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
19ec0d2f
Commit
19ec0d2f
authored
Jan 27, 2020
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build: Fix more build warnings caused by PR #2038.
Revisit fix for #2062 for consistency with this commit.
parent
d5f2f7b9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
glslang_c_interface.cpp
glslang/CInterface/glslang_c_interface.cpp
+2
-2
Intermediate.cpp
glslang/MachineIndependent/Intermediate.cpp
+2
-1
ShaderLang.cpp
glslang/MachineIndependent/ShaderLang.cpp
+6
-0
No files found.
glslang/CInterface/glslang_c_interface.cpp
View file @
19ec0d2f
...
...
@@ -355,7 +355,7 @@ int glslang_shader_preprocess(glslang_shader_t* shader, const glslang_input_t* i
return
shader
->
shader
->
preprocess
(
/* No user-defined resources limit */
&
glslang
::
DefaultTBuiltInResource
,
i
->
default_version
,
c_shader_profile
(
i
->
default_profile
),
(
bool
)
i
->
force_default_version_and_profile
,
(
bool
)
i
->
forward_compatible
,
i
->
force_default_version_and_profile
!=
0
,
i
->
forward_compatible
!=
0
,
(
EShMessages
)
c_shader_messages
(
i
->
messages
),
&
shader
->
preprocessedGLSL
,
Includer
);
}
...
...
@@ -367,7 +367,7 @@ int glslang_shader_parse(glslang_shader_t* shader, const glslang_input_t* input)
return
shader
->
shader
->
parse
(
/* No user-defined resource limits for now */
&
glslang
::
DefaultTBuiltInResource
,
input
->
default_version
,
(
bool
)
input
->
forward_compatible
,
&
glslang
::
DefaultTBuiltInResource
,
input
->
default_version
,
input
->
forward_compatible
!=
0
,
(
EShMessages
)
c_shader_messages
(
input
->
messages
));
}
...
...
glslang/MachineIndependent/Intermediate.cpp
View file @
19ec0d2f
...
...
@@ -2774,8 +2774,9 @@ bool TIntermediate::postProcess(TIntermNode* root, EShLanguage /*language*/)
case
EShTexSampTransUpgradeTextureRemoveSampler
:
performTextureUpgradeAndSamplerRemovalTransformation
(
root
);
break
;
defaul
t
:
case
EShTexSampTransCoun
t
:
assert
(
0
);
break
;
}
#endif
...
...
glslang/MachineIndependent/ShaderLang.cpp
View file @
19ec0d2f
...
...
@@ -716,6 +716,9 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages
case
EShClientOpenGL
:
spvVersion
.
openGl
=
environment
->
input
.
dialectVersion
;
break
;
case
EShClientCount
:
assert
(
0
);
break
;
}
switch
(
environment
->
input
.
languageFamily
)
{
case
EShSourceNone
:
...
...
@@ -728,6 +731,9 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages
source
=
EShSourceHlsl
;
messages
=
static_cast
<
EShMessages
>
(
messages
|
EShMsgReadHlsl
);
break
;
case
EShClientCount
:
assert
(
0
);
break
;
}
}
...
...
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