Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
angle
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
angle
Commits
646ea1ec
Commit
646ea1ec
authored
Jun 15, 2012
by
alokp@chromium.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compile error for translator_hlsl.
git-svn-id:
https://angleproject.googlecode.com/svn/trunk@1153
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
0c1f5942
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
Diagnostics.h
src/compiler/Diagnostics.h
+2
-0
OutputHLSL.cpp
src/compiler/OutputHLSL.cpp
+2
-2
ParseHelper.h
src/compiler/ParseHelper.h
+1
-0
TranslatorHLSL.cpp
src/compiler/TranslatorHLSL.cpp
+1
-0
No files found.
src/compiler/Diagnostics.h
View file @
646ea1ec
...
@@ -17,6 +17,8 @@ class TDiagnostics : public pp::Diagnostics
...
@@ -17,6 +17,8 @@ class TDiagnostics : public pp::Diagnostics
TDiagnostics
(
TInfoSink
&
infoSink
);
TDiagnostics
(
TInfoSink
&
infoSink
);
virtual
~
TDiagnostics
();
virtual
~
TDiagnostics
();
TInfoSink
&
infoSink
()
{
return
mInfoSink
;
}
void
writeInfo
(
Severity
severity
,
void
writeInfo
(
Severity
severity
,
const
pp
::
SourceLocation
&
loc
,
const
pp
::
SourceLocation
&
loc
,
const
std
::
string
&
reason
,
const
std
::
string
&
reason
,
...
...
src/compiler/OutputHLSL.cpp
View file @
646ea1ec
...
@@ -101,8 +101,8 @@ void OutputHLSL::output()
...
@@ -101,8 +101,8 @@ void OutputHLSL::output()
mContext
.
treeRoot
->
traverse
(
this
);
// Output the body first to determine what has to go in the header
mContext
.
treeRoot
->
traverse
(
this
);
// Output the body first to determine what has to go in the header
header
();
header
();
mContext
.
infoSink
.
obj
<<
mHeader
.
c_str
();
mContext
.
infoSink
()
.
obj
<<
mHeader
.
c_str
();
mContext
.
infoSink
.
obj
<<
mBody
.
c_str
();
mContext
.
infoSink
()
.
obj
<<
mBody
.
c_str
();
}
}
TInfoSinkBase
&
OutputHLSL
::
getBodyStream
()
TInfoSinkBase
&
OutputHLSL
::
getBodyStream
()
...
...
src/compiler/ParseHelper.h
View file @
646ea1ec
...
@@ -67,6 +67,7 @@ struct TParseContext {
...
@@ -67,6 +67,7 @@ struct TParseContext {
bool
initPreprocessor
();
bool
initPreprocessor
();
void
destroyPreprocessor
();
void
destroyPreprocessor
();
TInfoSink
&
infoSink
()
{
return
diagnostics
.
infoSink
();
}
void
error
(
TSourceLoc
loc
,
const
char
*
reason
,
const
char
*
token
,
void
error
(
TSourceLoc
loc
,
const
char
*
reason
,
const
char
*
token
,
const
char
*
extraInfoFormat
,
...);
const
char
*
extraInfoFormat
,
...);
void
warning
(
TSourceLoc
loc
,
const
char
*
reason
,
const
char
*
token
,
void
warning
(
TSourceLoc
loc
,
const
char
*
reason
,
const
char
*
token
,
...
...
src/compiler/TranslatorHLSL.cpp
View file @
646ea1ec
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
#include "compiler/TranslatorHLSL.h"
#include "compiler/TranslatorHLSL.h"
#include "compiler/InitializeParseContext.h"
#include "compiler/OutputHLSL.h"
#include "compiler/OutputHLSL.h"
TranslatorHLSL
::
TranslatorHLSL
(
ShShaderType
type
,
ShShaderSpec
spec
)
TranslatorHLSL
::
TranslatorHLSL
(
ShShaderType
type
,
ShShaderSpec
spec
)
...
...
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