Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 15:17:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix State.h after bad merge

Browse source
This commit is contained in:
Stephen Birarda 2015-08-18 11:51:23 -07:00
parent 0f77ab8611
commit aa1c36e61a
1 changed files with 357 additions and 357 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/gpu/src/gpu/State.h
View file

@ -22,22 +22,22 @@
// Because some of the fields are bool packed tightly in the State::Cache class
// and it s just not good anymore for template T& variable manipulation...
#define SET_FIELD(field, defaultValue, value, dest) {\
dest = value;\
if (value == defaultValue) {\
_signature.reset(field);\
} else {\
_signature.set(field);\
}\
_stamp++;\
dest = value;\
if (value == defaultValue) {\
_signature.reset(field);\
} else {\
_signature.set(field);\
}\
_stamp++;\
}\
namespace gpu {
class GPUObject;
class GPUObject;
class State {
public:
class State {
public:
State();
virtual ~State();
@ -385,7 +385,7 @@ public:
State(const Data& values);
const Data& getValues() const { return _values; }
protected:
protected:
State(const State& state);
State& operator=(const State& state);
@ -398,10 +398,10 @@ protected:
void setGPUObject(GPUObject* gpuObject) const { _gpuObject = gpuObject; }
GPUObject* getGPUObject() const { return _gpuObject; }
friend class Backend;
};
};
typedef std::shared_ptr< State > StatePointer;
typedef std::vector< StatePointer > States;
typedef std::shared_ptr< State > StatePointer;
typedef std::vector< StatePointer > States;
};