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
ced70f4e
Commit
ced70f4e
authored
Feb 27, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #178 from baldurk/minor-warning-fix
Minor warning fixes
parents
51843533
1be2ffa7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
GlslangToSpv.cpp
SPIRV/GlslangToSpv.cpp
+2
-0
SpvBuilder.cpp
SPIRV/SpvBuilder.cpp
+1
-1
localintermediate.h
glslang/MachineIndependent/localintermediate.h
+1
-1
No files found.
SPIRV/GlslangToSpv.cpp
View file @
ced70f4e
...
@@ -351,6 +351,8 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
...
@@ -351,6 +351,8 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
case
EShLangTessEvaluation
:
case
EShLangTessEvaluation
:
builder
.
addCapability
(
spv
::
CapabilityTessellationPointSize
);
builder
.
addCapability
(
spv
::
CapabilityTessellationPointSize
);
break
;
break
;
default
:
break
;
}
}
return
spv
::
BuiltInPointSize
;
return
spv
::
BuiltInPointSize
;
...
...
SPIRV/SpvBuilder.cpp
View file @
ced70f4e
...
@@ -2121,7 +2121,7 @@ Id Builder::accessChainGetInferredType()
...
@@ -2121,7 +2121,7 @@ Id Builder::accessChainGetInferredType()
if
(
accessChain
.
swizzle
.
size
()
==
1
)
if
(
accessChain
.
swizzle
.
size
()
==
1
)
type
=
getContainedTypeId
(
type
);
type
=
getContainedTypeId
(
type
);
else
if
(
accessChain
.
swizzle
.
size
()
>
1
)
else
if
(
accessChain
.
swizzle
.
size
()
>
1
)
type
=
makeVectorType
(
getContainedTypeId
(
type
),
accessChain
.
swizzle
.
size
());
type
=
makeVectorType
(
getContainedTypeId
(
type
),
(
int
)
accessChain
.
swizzle
.
size
());
// dereference component selection
// dereference component selection
if
(
accessChain
.
component
)
if
(
accessChain
.
component
)
...
...
glslang/MachineIndependent/localintermediate.h
View file @
ced70f4e
...
@@ -267,7 +267,7 @@ public:
...
@@ -267,7 +267,7 @@ public:
localSizeSpecId
[
dim
]
=
id
;
localSizeSpecId
[
dim
]
=
id
;
return
true
;
return
true
;
}
}
unsigned
int
getLocalSizeSpecId
(
int
dim
)
const
{
return
localSizeSpecId
[
dim
];
}
int
getLocalSizeSpecId
(
int
dim
)
const
{
return
localSizeSpecId
[
dim
];
}
void
setXfbMode
()
{
xfbMode
=
true
;
}
void
setXfbMode
()
{
xfbMode
=
true
;
}
bool
getXfbMode
()
const
{
return
xfbMode
;
}
bool
getXfbMode
()
const
{
return
xfbMode
;
}
...
...
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