Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix warnings

Browse source
This commit is contained in:
Brad Davis 2019-10-04 18:20:10 -07:00
parent 243120b95c
commit d69a83a2f2
3 changed files with 120 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -517,8 +517,6 @@ ktx::StoragePointer textureToKtx(const gpu::Texture& texture) {
void OpenGLDisplayPlugin::captureFrame(const std::string& filename) const {
withOtherThreadContext([&] {
using namespace gpu;
auto glBackend = const_cast<OpenGLDisplayPlugin&>(*this).getGLBackend();
FramebufferPointer framebuffer{ Framebuffer::create("captureFramebuffer") };
TextureCapturer captureLambda = [&](const gpu::TexturePointer& texture)->storage::StoragePointer {
return textureToKtx(*texture);
};

2
libraries/gpu/src/gpu/FrameIO.h
View file

@ -29,7 +29,7 @@ using Storage = storage::Storage;
using StoragePointer = storage::Pointer;
using StorageBuilders = storage::Builders;
constexpr char* const EXTENSION{ ".hfb" };
constexpr const char* const EXTENSION{ ".hfb" };
constexpr uint32_t HEADER_SIZE{ sizeof(uint32_t) * 3 };
constexpr uint32_t CHUNK_HEADER_SIZE = sizeof(uint32_t) * 2;
constexpr uint32_t MAGIC{ 0x49464948 };

238
libraries/gpu/src/gpu/FrameIOKeys.h
View file

@ -12,129 +12,129 @@
namespace gpu { namespace keys {
constexpr char* const binary = "binary";
constexpr char* const L00 = "L00";
constexpr char* const L1m1 = "L1m1";
constexpr char* const L10 = "L10";
constexpr char* const L11 = "L11";
constexpr char* const L2m2 = "L2m2";
constexpr char* const L2m1 = "L2m1";
constexpr char* const L20 = "L20";
constexpr char* const L21 = "L21";
constexpr char* const L22 = "L22";
constexpr const char* binary = "binary";
constexpr const char* L00 = "L00";
constexpr const char* L1m1 = "L1m1";
constexpr const char* L10 = "L10";
constexpr const char* L11 = "L11";
constexpr const char* L2m2 = "L2m2";
constexpr const char* L2m1 = "L2m1";
constexpr const char* L20 = "L20";
constexpr const char* L21 = "L21";
constexpr const char* L22 = "L22";
constexpr char* const eyeProjections = "eyeProjections";
constexpr char* const eyeViews = "eyeViews";
constexpr char* const alphaToCoverageEnable = "alphaToCoverageEnable";
constexpr char* const antialisedLineEnable = "antialisedLineEnable";
constexpr char* const attributes = "attributes";
constexpr char* const batches = "batches";
constexpr char* const blendFunction = "blendFunction";
constexpr char* const borderColor = "borderColor";
constexpr char* const bufferMask = "bufferMask";
constexpr char* const buffers = "buffers";
constexpr char* const capturedTextures = "capturedTextures";
constexpr char* const channel = "channel";
constexpr char* const chunk = "chunk";
constexpr char* const colorAttachments = "colorAttachments";
constexpr char* const colorWriteMask = "colorWriteMask";
constexpr char* const commands = "commands";
constexpr char* const comparisonFunction = "comparisonFunction";
constexpr char* const cullMode = "cullMode";
constexpr char* const data = "data";
constexpr char* const depth = "depth";
constexpr char* const depthBias = "depthBias";
constexpr char* const depthBiasSlopeScale = "depthBiasSlopeScale";
constexpr char* const depthClampEnable = "depthClampEnable";
constexpr char* const depthStencilAttachment = "depthStencilAttachment";
constexpr char* const depthTest = "depthTest";
constexpr char* const drawCallInfos = "drawCallInfos";
constexpr char* const drawcallUniform = "drawcallUniform";
constexpr char* const drawcallUniformReset = "drawcallUniformReset";
constexpr char* const element = "element";
constexpr char* const fillMode = "fillMode";
constexpr char* const filter = "filter";
constexpr char* const formats = "formats";
constexpr char* const frameIndex = "frameIndex";
constexpr char* const framebuffer = "framebuffer";
constexpr char* const framebuffers = "framebuffers";
constexpr char* const frequency = "frequency";
constexpr char* const frontFaceClockwise = "frontFaceClockwise";
constexpr char* const height = "height";
constexpr char* const id = "id";
constexpr char* const ktxFile = "ktxFile";
constexpr char* const layers = "layers";
constexpr char* const maxAnisotropy = "maxAnisotropy";
constexpr char* const maxMip = "maxMip";
constexpr char* const minMip = "minMip";
constexpr char* const mipOffset = "mipOffset";
constexpr char* const mips = "mips";
constexpr char* const multisampleEnable = "multisampleEnable";
constexpr char* const name = "name";
constexpr char* const namedData = "namedData";
constexpr char* const names = "names";
constexpr char* const objects = "objects";
constexpr char* const offset = "offset";
constexpr char* const pipelines = "pipelines";
constexpr char* const pose = "pose";
constexpr char* const profileRanges = "profileRanges";
constexpr char* const program = "program";
constexpr char* const programs = "programs";
constexpr char* const projectionJitter = "projectionJitter";
constexpr char* const queries = "queries";
constexpr char* const sampleCount = "sampleCount";
constexpr char* const sampleMask = "sampleMask";
constexpr char* const sampler = "sampler";
constexpr char* const samples = "samples";
constexpr char* const scissorEnable = "scissorEnable";
constexpr char* const shaders = "shaders";
constexpr char* const size = "size";
constexpr char* const skybox = "skybox";
constexpr char* const slot = "slot";
constexpr char* const source = "source";
constexpr char* const state = "state";
constexpr char* const stencilActivation = "stencilActivation";
constexpr char* const stencilTestBack = "stencilTestBack";
constexpr char* const stencilTestFront = "stencilTestFront";
constexpr char* const stereo = "stereo";
constexpr char* const subresource = "subresource";
constexpr char* const swapchains = "swapchains";
constexpr char* const texelFormat = "texelFormat";
constexpr char* const texture = "texture";
constexpr char* const textureTables = "textureTables";
constexpr char* const textures = "textures";
constexpr char* const transforms = "transforms";
constexpr char* const type = "type";
constexpr char* const usageType = "usageType";
constexpr char* const view = "view";
constexpr char* const width = "width";
constexpr char* const wrapModeU = "wrapModeU";
constexpr char* const wrapModeV = "wrapModeV";
constexpr char* const wrapModeW = "wrapModeW";
constexpr const char* eyeProjections = "eyeProjections";
constexpr const char* eyeViews = "eyeViews";
constexpr const char* alphaToCoverageEnable = "alphaToCoverageEnable";
constexpr const char* antialisedLineEnable = "antialisedLineEnable";
constexpr const char* attributes = "attributes";
constexpr const char* batches = "batches";
constexpr const char* blendFunction = "blendFunction";
constexpr const char* borderColor = "borderColor";
constexpr const char* bufferMask = "bufferMask";
constexpr const char* buffers = "buffers";
constexpr const char* capturedTextures = "capturedTextures";
constexpr const char* channel = "channel";
constexpr const char* chunk = "chunk";
constexpr const char* colorAttachments = "colorAttachments";
constexpr const char* colorWriteMask = "colorWriteMask";
constexpr const char* commands = "commands";
constexpr const char* comparisonFunction = "comparisonFunction";
constexpr const char* cullMode = "cullMode";
constexpr const char* data = "data";
constexpr const char* depth = "depth";
constexpr const char* depthBias = "depthBias";
constexpr const char* depthBiasSlopeScale = "depthBiasSlopeScale";
constexpr const char* depthClampEnable = "depthClampEnable";
constexpr const char* depthStencilAttachment = "depthStencilAttachment";
constexpr const char* depthTest = "depthTest";
constexpr const char* drawCallInfos = "drawCallInfos";
constexpr const char* drawcallUniform = "drawcallUniform";
constexpr const char* drawcallUniformReset = "drawcallUniformReset";
constexpr const char* element = "element";
constexpr const char* fillMode = "fillMode";
constexpr const char* filter = "filter";
constexpr const char* formats = "formats";
constexpr const char* frameIndex = "frameIndex";
constexpr const char* framebuffer = "framebuffer";
constexpr const char* framebuffers = "framebuffers";
constexpr const char* frequency = "frequency";
constexpr const char* frontFaceClockwise = "frontFaceClockwise";
constexpr const char* height = "height";
constexpr const char* id = "id";
constexpr const char* ktxFile = "ktxFile";
constexpr const char* layers = "layers";
constexpr const char* maxAnisotropy = "maxAnisotropy";
constexpr const char* maxMip = "maxMip";
constexpr const char* minMip = "minMip";
constexpr const char* mipOffset = "mipOffset";
constexpr const char* mips = "mips";
constexpr const char* multisampleEnable = "multisampleEnable";
constexpr const char* name = "name";
constexpr const char* namedData = "namedData";
constexpr const char* names = "names";
constexpr const char* objects = "objects";
constexpr const char* offset = "offset";
constexpr const char* pipelines = "pipelines";
constexpr const char* pose = "pose";
constexpr const char* profileRanges = "profileRanges";
constexpr const char* program = "program";
constexpr const char* programs = "programs";
constexpr const char* projectionJitter = "projectionJitter";
constexpr const char* queries = "queries";
constexpr const char* sampleCount = "sampleCount";
constexpr const char* sampleMask = "sampleMask";
constexpr const char* sampler = "sampler";
constexpr const char* samples = "samples";
constexpr const char* scissorEnable = "scissorEnable";
constexpr const char* shaders = "shaders";
constexpr const char* size = "size";
constexpr const char* skybox = "skybox";
constexpr const char* slot = "slot";
constexpr const char* source = "source";
constexpr const char* state = "state";
constexpr const char* stencilActivation = "stencilActivation";
constexpr const char* stencilTestBack = "stencilTestBack";
constexpr const char* stencilTestFront = "stencilTestFront";
constexpr const char* stereo = "stereo";
constexpr const char* subresource = "subresource";
constexpr const char* swapchains = "swapchains";
constexpr const char* texelFormat = "texelFormat";
constexpr const char* texture = "texture";
constexpr const char* textureTables = "textureTables";
constexpr const char* textures = "textures";
constexpr const char* transforms = "transforms";
constexpr const char* type = "type";
constexpr const char* usageType = "usageType";
constexpr const char* view = "view";
constexpr const char* width = "width";
constexpr const char* wrapModeU = "wrapModeU";
constexpr const char* wrapModeV = "wrapModeV";
constexpr const char* wrapModeW = "wrapModeW";
constexpr char* const backWriteMask = "backWriteMask";
constexpr char* const frontWriteMask = "frontWriteMask";
constexpr char* const reference = "reference";
constexpr char* const readMask = "readMask";
constexpr char* const failOp = "failOp";
constexpr char* const depthFailOp = "depthFailOp";
constexpr char* const passOp = "passOp";
constexpr char* const enabled = "enabled";
constexpr char* const blend = "blend";
constexpr char* const flags = "flags";
constexpr char* const writeMask = "writeMask";
constexpr char* const function = "function";
constexpr char* const sourceColor = "sourceColor";
constexpr char* const sourceAlpha = "sourceAlpha";
constexpr char* const destColor = "destColor";
constexpr char* const destAlpha = "destAlpha";
constexpr char* const opColor = "opColor";
constexpr char* const opAlpha = "opAlpha";
constexpr char* const enable = "enable";
constexpr char* const contextDisable = "contextDisable";
constexpr const char* backWriteMask = "backWriteMask";
constexpr const char* frontWriteMask = "frontWriteMask";
constexpr const char* reference = "reference";
constexpr const char* readMask = "readMask";
constexpr const char* failOp = "failOp";
constexpr const char* depthFailOp = "depthFailOp";
constexpr const char* passOp = "passOp";
constexpr const char* enabled = "enabled";
constexpr const char* blend = "blend";
constexpr const char* flags = "flags";
constexpr const char* writeMask = "writeMask";
constexpr const char* function = "function";
constexpr const char* sourceColor = "sourceColor";
constexpr const char* sourceAlpha = "sourceAlpha";
constexpr const char* destColor = "destColor";
constexpr const char* destAlpha = "destAlpha";
constexpr const char* opColor = "opColor";
constexpr const char* opAlpha = "opAlpha";
constexpr const char* enable = "enable";
constexpr const char* contextDisable = "contextDisable";
constexpr char* const COMMAND_NAMES[] = {
constexpr const char* COMMAND_NAMES[] = {
"draw",
"drawIndexed",
"drawInstanced",