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
219b025d
Commit
219b025d
authored
Aug 23, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Non-functional: Fix commit
98f164ec
.
Fix previous commit to not use tabs and otherwise match local coding conventions better.
parent
98f164ec
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
StandAlone.cpp
StandAlone/StandAlone.cpp
+3
-3
revision.h
glslang/Include/revision.h
+2
-2
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+4
-2
No files found.
StandAlone/StandAlone.cpp
View file @
219b025d
...
...
@@ -415,13 +415,13 @@ struct ShaderCompUnit {
char
**
text
;
// memory owned/managed externally
const
char
*
fileNameList
[
1
];
//Need to have a special constructors to adjust the fileNameList, since back end needs a list of ptrs
//
Need to have a special constructors to adjust the fileNameList, since back end needs a list of ptrs
ShaderCompUnit
(
EShLanguage
istage
,
std
::
string
&
ifileName
,
char
**
itext
)
{
stage
=
istage
;
fileName
=
ifileName
;
text
=
itext
;
fileNameList
[
0
]
=
fileName
.
c_str
();
fileNameList
[
0
]
=
fileName
.
c_str
();
}
ShaderCompUnit
(
const
ShaderCompUnit
&
rhs
)
...
...
@@ -429,7 +429,7 @@ struct ShaderCompUnit {
stage
=
rhs
.
stage
;
fileName
=
rhs
.
fileName
;
text
=
rhs
.
text
;
fileNameList
[
0
]
=
fileName
.
c_str
();
fileNameList
[
0
]
=
fileName
.
c_str
();
}
};
...
...
glslang/Include/revision.h
View file @
219b025d
...
...
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "SPIRV99.14
01
"
#define GLSLANG_DATE "
11
-Aug-2016"
#define GLSLANG_REVISION "SPIRV99.14
26
"
#define GLSLANG_DATE "
23
-Aug-2016"
hlsl/hlslParseHelper.cpp
View file @
219b025d
...
...
@@ -118,9 +118,11 @@ bool HlslParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner&
HlslGrammar
grammar
(
scanContext
,
*
this
);
if
(
!
grammar
.
parse
())
{
//Print out a nicer error message that should be formated such that if you click on the message it will take you right to the line through most UIs
// Print a message formated such that if you click on the message it will take you right to
// the line through most UIs.
const
glslang
::
TSourceLoc
&
sourceLoc
=
input
.
getSourceLoc
();
printf
(
"
\n
%s(%i): error at column %i, HLSL translation failed.
\n
"
,
sourceLoc
.
name
,
sourceLoc
.
line
,
sourceLoc
.
column
);
printf
(
"
\n
%s(%i): error at column %i, HLSL translation failed.
\n
"
,
sourceLoc
.
name
,
sourceLoc
.
line
,
sourceLoc
.
column
);
}
return
numErrors
==
0
;
}
...
...
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