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

resolve conflicts on merge with birarda/protocol

Browse source
This commit is contained in:
Stephen Birarda 2015-08-18 11:56:29 -07:00
commit 7addd9b205
1 changed files with 395 additions and 365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_gpu_State_h
#define hifi_gpu_State_h
@ -23,6 +24,35 @@
// 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.
//
// State
// libraries/gpu/src/gpu
//
// Created by Sam Gateau on 3/8/2015.
// Copyright 2014 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_gpu_State_h
#define hifi_gpu_State_h
#include "Format.h"
#include <memory>
#include <vector>
#include <unordered_map>
#include <bitset>
// Why a macro and not a fancy template you will ask me ?
// 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 {\
@ -34,10 +64,10 @@ _stamp++;\
namespace gpu {
class GPUObject;
class GPUObject;
class State {
public:
class State {
public:
State();
virtual ~State();
@ -385,7 +415,7 @@ namespace gpu {
State(const Data& values);
const Data& getValues() const { return _values; }
protected:
protected:
State(const State& state);
State& operator=(const State& state);
@ -398,10 +428,10 @@ namespace gpu {
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;
};