From e03b0b5825ed8d0309c8b9aacfe00d97adeb44d2 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 7 Sep 2016 12:45:44 -0700 Subject: [PATCH] Cleanup dead code --- .../gpu-gl/src/gpu/gl/GLTextureTransfer.h | 24 ------------------- libraries/gpu-gl/src/gpu/gl45/GL45Backend.h | 1 - 2 files changed, 25 deletions(-) diff --git a/libraries/gpu-gl/src/gpu/gl/GLTextureTransfer.h b/libraries/gpu-gl/src/gpu/gl/GLTextureTransfer.h index f88dddc5ff..d2207df7e6 100644 --- a/libraries/gpu-gl/src/gpu/gl/GLTextureTransfer.h +++ b/libraries/gpu-gl/src/gpu/gl/GLTextureTransfer.h @@ -23,30 +23,6 @@ namespace gpu { namespace gl { -using VoidLambda = std::function; - -#if 0 -struct TextureTransferPackage { - std::weak_ptr texture; - GLsync fence; -}; - -struct TextureTransferBlock { - GLuint _pbo { 0 }; - void* _mapped { nullptr }; - GLsync _fence; - std::function _transferCallback; - bool isSignaled(); - void transfer(); -}; - -using CommandQueue = std::list; -struct FencedLambda { - GLsync _fence { 0 }; - VoidLambda _callback; -}; -#endif - using TextureList = std::list; using TextureListIterator = TextureList::iterator; diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h b/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h index 22e1a87719..eab1aa07d8 100644 --- a/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h +++ b/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h @@ -66,7 +66,6 @@ public: void allocateMip(uint16_t mipLevel, uint8_t face = 0) const; void allocateStorage() const override; void updateSize() const override; -// void transfer() const override; void syncSampler() const override; void generateMips() const override; void withPreservedTexture(std::function f) const override;