commit e87ca0000e1ef1068db2a972f81f55579705f162
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Jul 24 18:30:43 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Jul 24 18:30:43 2012 +0000
tree 9cd7b61b7cb474e16433f2e7829ca4dc4a9f8f5c
parent 5ae3ccc34abd1ee0e29bd529a0544da240244f4b

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

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 3977f20..6eebb8a 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -57,7 +57,9 @@
 {
 }
 
-ProgramBinary::ProgramBinary()
+unsigned int ProgramBinary::mCurrentSerial = 1;
+
+ProgramBinary::ProgramBinary() : mSerial(issueSerial())
 {
     mDevice = getDevice();
 
@@ -123,6 +125,16 @@
     }
 }
 
+unsigned int ProgramBinary::getSerial() const
+{
+    return mSerial;
+}
+
+unsigned int ProgramBinary::issueSerial()
+{
+    return mCurrentSerial++;
+}
+
 IDirect3DPixelShader9 *ProgramBinary::getPixelShader()
 {
     return mPixelExecutable;

src/libGLESv2/ProgramBinary.h

diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index 8a587b9..f928644 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -155,6 +155,8 @@
     bool validateSamplers(InfoLog *infoLog);
     bool isValidated() const;
 
+    unsigned int getSerial() const;
+
     static std::string decorateAttribute(const std::string &name);    // Prepend an underscore
     static std::string undecorateUniform(const std::string &_name);   // Remove leading underscore
 
@@ -219,6 +221,11 @@
     GLint mDxPointsOrLinesLocation;
 
     bool mValidated;
+
+    const unsigned int mSerial;
+
+    static unsigned int issueSerial();
+    static unsigned int mCurrentSerial;
 };
 }