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
e87ca000
Commit
e87ca000
authored
Jul 24, 2012
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add serial tracking to ProgramBinary
Trac #21270 Bug=351 Signed-off-by: Nicolas Capens git-svn-id:
https://angleproject.googlecode.com/svn/trunk@1232
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
5ae3ccc3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
ProgramBinary.cpp
src/libGLESv2/ProgramBinary.cpp
+13
-1
ProgramBinary.h
src/libGLESv2/ProgramBinary.h
+7
-0
No files found.
src/libGLESv2/ProgramBinary.cpp
View file @
e87ca000
...
@@ -57,7 +57,9 @@ UniformLocation::UniformLocation(const std::string &_name, unsigned int element,
...
@@ -57,7 +57,9 @@ UniformLocation::UniformLocation(const std::string &_name, unsigned int element,
{
{
}
}
ProgramBinary
::
ProgramBinary
()
unsigned
int
ProgramBinary
::
mCurrentSerial
=
1
;
ProgramBinary
::
ProgramBinary
()
:
mSerial
(
issueSerial
())
{
{
mDevice
=
getDevice
();
mDevice
=
getDevice
();
...
@@ -123,6 +125,16 @@ ProgramBinary::~ProgramBinary()
...
@@ -123,6 +125,16 @@ ProgramBinary::~ProgramBinary()
}
}
}
}
unsigned
int
ProgramBinary
::
getSerial
()
const
{
return
mSerial
;
}
unsigned
int
ProgramBinary
::
issueSerial
()
{
return
mCurrentSerial
++
;
}
IDirect3DPixelShader9
*
ProgramBinary
::
getPixelShader
()
IDirect3DPixelShader9
*
ProgramBinary
::
getPixelShader
()
{
{
return
mPixelExecutable
;
return
mPixelExecutable
;
...
...
src/libGLESv2/ProgramBinary.h
View file @
e87ca000
...
@@ -155,6 +155,8 @@ class ProgramBinary
...
@@ -155,6 +155,8 @@ class ProgramBinary
bool
validateSamplers
(
InfoLog
*
infoLog
);
bool
validateSamplers
(
InfoLog
*
infoLog
);
bool
isValidated
()
const
;
bool
isValidated
()
const
;
unsigned
int
getSerial
()
const
;
static
std
::
string
decorateAttribute
(
const
std
::
string
&
name
);
// Prepend an underscore
static
std
::
string
decorateAttribute
(
const
std
::
string
&
name
);
// Prepend an underscore
static
std
::
string
undecorateUniform
(
const
std
::
string
&
_name
);
// Remove leading underscore
static
std
::
string
undecorateUniform
(
const
std
::
string
&
_name
);
// Remove leading underscore
...
@@ -219,6 +221,11 @@ class ProgramBinary
...
@@ -219,6 +221,11 @@ class ProgramBinary
GLint
mDxPointsOrLinesLocation
;
GLint
mDxPointsOrLinesLocation
;
bool
mValidated
;
bool
mValidated
;
const
unsigned
int
mSerial
;
static
unsigned
int
issueSerial
();
static
unsigned
int
mCurrentSerial
;
};
};
}
}
...
...
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