Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidy code

Browse Source
This commit is contained in:
Mathias Agopian
2018-08-09 18:07:18 -07:00
committed by Mathias Agopian
parent c429af310e
commit c2362fa2cd
3 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filament/include/filament/driver/ExternalContext.h
View File

@@ -45,7 +45,7 @@ public:
// Creates and and initializes the low-level API (e.g. an OpenGL context or Vulkan instance),
// then creates the concrete Driver. Returns null on failure.
virtual std::unique_ptr<Driver> createDriver(void* const sharedGLContext) noexcept = 0;
virtual std::unique_ptr<Driver> createDriver(void* sharedGLContext) noexcept = 0;
virtual ~ExternalContext() noexcept;

38
filament/src/driver/opengl/ContextManagerCocoa.h
View File

@@ -29,34 +29,34 @@ struct ContextManagerCocoaImpl;
class ContextManagerCocoa final : public driver::ContextManagerGL {
public:
ContextManagerCocoa();
~ContextManagerCocoa() noexcept final override;
~ContextManagerCocoa() noexcept final;
std::unique_ptr<Driver> createDriver(void* const sharedGLContext) noexcept override;
void terminate() noexcept final override;
std::unique_ptr<Driver> createDriver(void* sharedGLContext) noexcept override;
void terminate() noexcept final;
SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final override;
void destroySwapChain(SwapChain* swapChain) noexcept final override;
void makeCurrent(SwapChain* swapChain) noexcept final override;
void commit(SwapChain* swapChain) noexcept final override;
SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final;
void destroySwapChain(SwapChain* swapChain) noexcept final;
void makeCurrent(SwapChain* swapChain) noexcept final;
void commit(SwapChain* swapChain) noexcept final;
Fence* createFence() noexcept final override { return nullptr; }
void destroyFence(Fence* fence) noexcept final override {}
driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final override {
Fence* createFence() noexcept final { return nullptr; }
void destroyFence(Fence* fence) noexcept final {}
driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final {
return driver::FenceStatus::ERROR;
}
Stream* createStream(void* nativeStream) noexcept final override { return nullptr; }
void destroyStream(Stream* stream) noexcept final override {}
void attach(Stream* stream, intptr_t tname) noexcept final override {}
void detach(Stream* stream) noexcept final override {}
void updateTexImage(Stream* stream) noexcept final override {}
Stream* createStream(void* nativeStream) noexcept final { return nullptr; }
void destroyStream(Stream* stream) noexcept final {}
void attach(Stream* stream, intptr_t tname) noexcept final {}
void detach(Stream* stream) noexcept final {}
void updateTexImage(Stream* stream) noexcept final {}
ExternalTexture* createExternalTextureStorage() noexcept final override { return nullptr; }
ExternalTexture* createExternalTextureStorage() noexcept final { return nullptr; }
void reallocateExternalStorage(ExternalTexture* ets,
uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final override { }
void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final override { }
uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final { }
void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final { }
int getOSVersion() const noexcept final override { return 0; }
int getOSVersion() const noexcept final { return 0; }
private:
ContextManagerCocoaImpl* pImpl = nullptr;

36
filament/src/driver/opengl/ContextManagerEGL.h
View File

@@ -38,31 +38,31 @@ public:
ContextManagerEGL() noexcept;
std::unique_ptr<Driver> createDriver(void* const sharedGLContext) noexcept override;
std::unique_ptr<Driver> createDriver(void* sharedGLContext) noexcept override;
void terminate() noexcept override;
SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final override;
void destroySwapChain(SwapChain* swapChain) noexcept final override;
void makeCurrent(SwapChain* swapChain) noexcept final override;
void commit(SwapChain* swapChain) noexcept final override;
SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final;
void destroySwapChain(SwapChain* swapChain) noexcept final;
void makeCurrent(SwapChain* swapChain) noexcept final;
void commit(SwapChain* swapChain) noexcept final;
bool canCreateFence() noexcept final override { return true; }
Fence* createFence() noexcept final override;
void destroyFence(Fence* fence) noexcept final override;
driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final override;
bool canCreateFence() noexcept final { return true; }
Fence* createFence() noexcept final;
void destroyFence(Fence* fence) noexcept final;
driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final;
Stream* createStream(void* nativeStream) noexcept final override;
void destroyStream(Stream* stream) noexcept final override;
void attach(Stream* stream, intptr_t tname) noexcept final override;
void detach(Stream* stream) noexcept final override;
void updateTexImage(Stream* stream) noexcept final override;
Stream* createStream(void* nativeStream) noexcept final;
void destroyStream(Stream* stream) noexcept final;
void attach(Stream* stream, intptr_t tname) noexcept final;
void detach(Stream* stream) noexcept final;
void updateTexImage(Stream* stream) noexcept final;
ExternalTexture* createExternalTextureStorage() noexcept final override;
ExternalTexture* createExternalTextureStorage() noexcept final;
void reallocateExternalStorage(ExternalTexture* ets,
uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final override;
void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final override;
uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final;
void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final;
int getOSVersion() const noexcept final override;
int getOSVersion() const noexcept final;
private:
EGLBoolean makeCurrent(EGLSurface surface) noexcept;