Skip to content

S
swiftshader
Commit c634fb61 by Alexis Hetu Committed by Nicolas Capens
Options

Fixed some virtual function related warnings

Some virtual functions with common names had different signature, which generates warnings. These functions didn't need to be virtual, so they are no longer virtual in order to fix the warnings. Change-Id: I4d8f5a9fdb3f4f520efe1aea0ce5d179b519bf8b Reviewed-on: https://swiftshader-review.googlesource.com/5461Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent 7eaa10a3
Showing with 301 additions and 301 deletions
src/OpenGL/libGL/Device.hpp
...@@ -51,22 +51,22 @@ namespace gl ...@@ -51,22 +51,22 @@ namespace gl
virtual ~Device(); virtual ~Device();
virtual void clearColor(float red, float green, float blue, float alpha, unsigned int rgbaMask); void clearColor(float red, float green, float blue, float alpha, unsigned int rgbaMask);
virtual void clearDepth(float z); void clearDepth(float z);
virtual void clearStencil(unsigned int stencil, unsigned int mask); void clearStencil(unsigned int stencil, unsigned int mask);
virtual Image *createDepthStencilSurface(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); Image *createDepthStencilSurface(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
virtual Image *createRenderTarget(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool lockable); Image *createRenderTarget(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool lockable);
virtual void drawIndexedPrimitive(PrimitiveType type, unsigned int indexOffset, unsigned int primitiveCount, int indexSize); void drawIndexedPrimitive(PrimitiveType type, unsigned int indexOffset, unsigned int primitiveCount, int indexSize);
virtual void drawPrimitive(PrimitiveType primitiveType, unsigned int primiveCount); void drawPrimitive(PrimitiveType primitiveType, unsigned int primiveCount);
virtual void setDepthStencilSurface(Image *newDepthStencil); void setDepthStencilSurface(Image *newDepthStencil);
virtual void setPixelShader(sw::PixelShader *shader); void setPixelShader(sw::PixelShader *shader);
virtual void setPixelShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count); void setPixelShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count);
virtual void setScissorEnable(bool enable); void setScissorEnable(bool enable);
virtual void setRenderTarget(int index, Image *renderTarget); void setRenderTarget(int index, Image *renderTarget);
virtual void setScissorRect(const sw::Rect &rect); void setScissorRect(const sw::Rect &rect);
virtual void setVertexShader(sw::VertexShader *shader); void setVertexShader(sw::VertexShader *shader);
virtual void setVertexShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count); void setVertexShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count);
virtual void setViewport(const Viewport &viewport); void setViewport(const Viewport &viewport);
virtual bool stretchRect(Image *sourceSurface, const sw::SliceRect *sourceRect, Image *destSurface, const sw::SliceRect *destRect, bool filter); virtual bool stretchRect(Image *sourceSurface, const sw::SliceRect *sourceRect, Image *destSurface, const sw::SliceRect *destRect, bool filter);
virtual void finish(); virtual void finish();
......
src/OpenGL/libGLES_CM/Device.hpp
...@@ -43,22 +43,22 @@ namespace es1 ...@@ -43,22 +43,22 @@ namespace es1
virtual ~Device(); virtual ~Device();
virtual void clearColor(float red, float green, float blue, float alpha, unsigned int rgbaMask); void clearColor(float red, float green, float blue, float alpha, unsigned int rgbaMask);
virtual void clearDepth(float z); void clearDepth(float z);
virtual void clearStencil(unsigned int stencil, unsigned int mask); void clearStencil(unsigned int stencil, unsigned int mask);
virtual egl::Image *createDepthStencilSurface(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); egl::Image *createDepthStencilSurface(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
virtual egl::Image *createRenderTarget(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool lockable); egl::Image *createRenderTarget(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool lockable);
virtual void drawIndexedPrimitive(sw::DrawType type, unsigned int indexOffset, unsigned int primitiveCount); void drawIndexedPrimitive(sw::DrawType type, unsigned int indexOffset, unsigned int primitiveCount);
virtual void drawPrimitive(sw::DrawType type, unsigned int primiveCount); void drawPrimitive(sw::DrawType type, unsigned int primiveCount);
virtual void setScissorEnable(bool enable); void setScissorEnable(bool enable);
virtual void setRenderTarget(int index, egl::Image *renderTarget); void setRenderTarget(int index, egl::Image *renderTarget);
virtual void setDepthBuffer(egl::Image *depthBuffer); void setDepthBuffer(egl::Image *depthBuffer);
virtual void setStencilBuffer(egl::Image *stencilBuffer); void setStencilBuffer(egl::Image *stencilBuffer);
virtual void setScissorRect(const sw::Rect &rect); void setScissorRect(const sw::Rect &rect);
virtual void setViewport(const Viewport &viewport); void setViewport(const Viewport &viewport);
virtual bool stretchRect(sw::Surface *sourceSurface, const sw::SliceRect *sourceRect, sw::Surface *destSurface, const sw::SliceRect *destRect, bool filter); bool stretchRect(sw::Surface *sourceSurface, const sw::SliceRect *sourceRect, sw::Surface *destSurface, const sw::SliceRect *destRect, bool filter);
virtual void finish(); void finish();
private: private:
sw::Context *const context; sw::Context *const context;
......
src/OpenGL/libGLESv2/Device.hpp
...@@ -43,27 +43,27 @@ namespace es2 ...@@ -43,27 +43,27 @@ namespace es2
virtual ~Device(); virtual ~Device();
virtual void clearColor(float red, float green, float blue, float alpha, unsigned int rgbaMask); void clearColor(float red, float green, float blue, float alpha, unsigned int rgbaMask);
virtual void clearDepth(float z); void clearDepth(float z);
virtual void clearStencil(unsigned int stencil, unsigned int mask); void clearStencil(unsigned int stencil, unsigned int mask);
virtual egl::Image *createDepthStencilSurface(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); egl::Image *createDepthStencilSurface(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
virtual egl::Image *createRenderTarget(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool lockable); egl::Image *createRenderTarget(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool lockable);
virtual void drawIndexedPrimitive(sw::DrawType type, unsigned int indexOffset, unsigned int primitiveCount); void drawIndexedPrimitive(sw::DrawType type, unsigned int indexOffset, unsigned int primitiveCount);
virtual void drawPrimitive(sw::DrawType type, unsigned int primiveCount); void drawPrimitive(sw::DrawType type, unsigned int primiveCount);
virtual void setPixelShader(sw::PixelShader *shader); void setPixelShader(sw::PixelShader *shader);
virtual void setPixelShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count); void setPixelShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count);
virtual void setScissorEnable(bool enable); void setScissorEnable(bool enable);
virtual void setRenderTarget(int index, egl::Image *renderTarget); void setRenderTarget(int index, egl::Image *renderTarget);
virtual void setDepthBuffer(egl::Image *depthBuffer); void setDepthBuffer(egl::Image *depthBuffer);
virtual void setStencilBuffer(egl::Image *stencilBuffer); void setStencilBuffer(egl::Image *stencilBuffer);
virtual void setScissorRect(const sw::Rect &rect); void setScissorRect(const sw::Rect &rect);
virtual void setVertexShader(sw::VertexShader *shader); void setVertexShader(sw::VertexShader *shader);
virtual void setVertexShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count); void setVertexShaderConstantF(unsigned int startRegister, const float *constantData, unsigned int count);
virtual void setViewport(const Viewport &viewport); void setViewport(const Viewport &viewport);
virtual bool stretchRect(sw::Surface *sourceSurface, const sw::SliceRect *sourceRect, sw::Surface *destSurface, const sw::SliceRect *destRect, bool filter); bool stretchRect(sw::Surface *sourceSurface, const sw::SliceRect *sourceRect, sw::Surface *destSurface, const sw::SliceRect *destRect, bool filter);
virtual bool stretchCube(sw::Surface *sourceSurface, sw::Surface *destSurface); bool stretchCube(sw::Surface *sourceSurface, sw::Surface *destSurface);
virtual void finish(); void finish();
private: private:
sw::Context *const context; sw::Context *const context;
......
src/Renderer/PixelProcessor.hpp
...@@ -189,115 +189,115 @@ namespace sw ...@@ -189,115 +189,115 @@ namespace sw
virtual ~PixelProcessor(); virtual ~PixelProcessor();
virtual void setFloatConstant(unsigned int index, const float value[4]); void setFloatConstant(unsigned int index, const float value[4]);
virtual void setIntegerConstant(unsigned int index, const int value[4]); void setIntegerConstant(unsigned int index, const int value[4]);
virtual void setBooleanConstant(unsigned int index, int boolean); void setBooleanConstant(unsigned int index, int boolean);
virtual void setUniformBuffer(int index, sw::Resource* buffer, int offset); void setUniformBuffer(int index, sw::Resource* buffer, int offset);
virtual void lockUniformBuffers(byte** u, sw::Resource* uniformBuffers[]); void lockUniformBuffers(byte** u, sw::Resource* uniformBuffers[]);
virtual void setRenderTarget(int index, Surface *renderTarget); void setRenderTarget(int index, Surface *renderTarget);
virtual void setDepthBuffer(Surface *depthBuffer); void setDepthBuffer(Surface *depthBuffer);
virtual void setStencilBuffer(Surface *stencilBuffer); void setStencilBuffer(Surface *stencilBuffer);
virtual void setTexCoordIndex(unsigned int stage, int texCoordIndex); void setTexCoordIndex(unsigned int stage, int texCoordIndex);
virtual void setStageOperation(unsigned int stage, TextureStage::StageOperation stageOperation); void setStageOperation(unsigned int stage, TextureStage::StageOperation stageOperation);
virtual void setFirstArgument(unsigned int stage, TextureStage::SourceArgument firstArgument); void setFirstArgument(unsigned int stage, TextureStage::SourceArgument firstArgument);
virtual void setSecondArgument(unsigned int stage, TextureStage::SourceArgument secondArgument); void setSecondArgument(unsigned int stage, TextureStage::SourceArgument secondArgument);
virtual void setThirdArgument(unsigned int stage, TextureStage::SourceArgument thirdArgument); void setThirdArgument(unsigned int stage, TextureStage::SourceArgument thirdArgument);
virtual void setStageOperationAlpha(unsigned int stage, TextureStage::StageOperation stageOperationAlpha); void setStageOperationAlpha(unsigned int stage, TextureStage::StageOperation stageOperationAlpha);
virtual void setFirstArgumentAlpha(unsigned int stage, TextureStage::SourceArgument firstArgumentAlpha); void setFirstArgumentAlpha(unsigned int stage, TextureStage::SourceArgument firstArgumentAlpha);
virtual void setSecondArgumentAlpha(unsigned int stage, TextureStage::SourceArgument secondArgumentAlpha); void setSecondArgumentAlpha(unsigned int stage, TextureStage::SourceArgument secondArgumentAlpha);
virtual void setThirdArgumentAlpha(unsigned int stage, TextureStage::SourceArgument thirdArgumentAlpha); void setThirdArgumentAlpha(unsigned int stage, TextureStage::SourceArgument thirdArgumentAlpha);
virtual void setFirstModifier(unsigned int stage, TextureStage::ArgumentModifier firstModifier); void setFirstModifier(unsigned int stage, TextureStage::ArgumentModifier firstModifier);
virtual void setSecondModifier(unsigned int stage, TextureStage::ArgumentModifier secondModifier); void setSecondModifier(unsigned int stage, TextureStage::ArgumentModifier secondModifier);
virtual void setThirdModifier(unsigned int stage, TextureStage::ArgumentModifier thirdModifier); void setThirdModifier(unsigned int stage, TextureStage::ArgumentModifier thirdModifier);
virtual void setFirstModifierAlpha(unsigned int stage, TextureStage::ArgumentModifier firstModifierAlpha); void setFirstModifierAlpha(unsigned int stage, TextureStage::ArgumentModifier firstModifierAlpha);
virtual void setSecondModifierAlpha(unsigned int stage, TextureStage::ArgumentModifier secondModifierAlpha); void setSecondModifierAlpha(unsigned int stage, TextureStage::ArgumentModifier secondModifierAlpha);
virtual void setThirdModifierAlpha(unsigned int stage, TextureStage::ArgumentModifier thirdModifierAlpha); void setThirdModifierAlpha(unsigned int stage, TextureStage::ArgumentModifier thirdModifierAlpha);
virtual void setDestinationArgument(unsigned int stage, TextureStage::DestinationArgument destinationArgument); void setDestinationArgument(unsigned int stage, TextureStage::DestinationArgument destinationArgument);
virtual void setConstantColor(unsigned int stage, const Color<float> &constantColor); void setConstantColor(unsigned int stage, const Color<float> &constantColor);
virtual void setBumpmapMatrix(unsigned int stage, int element, float value); void setBumpmapMatrix(unsigned int stage, int element, float value);
virtual void setLuminanceScale(unsigned int stage, float value); void setLuminanceScale(unsigned int stage, float value);
virtual void setLuminanceOffset(unsigned int stage, float value); void setLuminanceOffset(unsigned int stage, float value);
virtual void setTextureFilter(unsigned int sampler, FilterType textureFilter); void setTextureFilter(unsigned int sampler, FilterType textureFilter);
virtual void setMipmapFilter(unsigned int sampler, MipmapType mipmapFilter); void setMipmapFilter(unsigned int sampler, MipmapType mipmapFilter);
virtual void setGatherEnable(unsigned int sampler, bool enable); void setGatherEnable(unsigned int sampler, bool enable);
virtual void setAddressingModeU(unsigned int sampler, AddressingMode addressingMode); void setAddressingModeU(unsigned int sampler, AddressingMode addressingMode);
virtual void setAddressingModeV(unsigned int sampler, AddressingMode addressingMode); void setAddressingModeV(unsigned int sampler, AddressingMode addressingMode);
virtual void setAddressingModeW(unsigned int sampler, AddressingMode addressingMode); void setAddressingModeW(unsigned int sampler, AddressingMode addressingMode);
virtual void setReadSRGB(unsigned int sampler, bool sRGB); void setReadSRGB(unsigned int sampler, bool sRGB);
virtual void setMipmapLOD(unsigned int sampler, float bias); void setMipmapLOD(unsigned int sampler, float bias);
virtual void setBorderColor(unsigned int sampler, const Color<float> &borderColor); void setBorderColor(unsigned int sampler, const Color<float> &borderColor);
virtual void setMaxAnisotropy(unsigned int sampler, float maxAnisotropy); void setMaxAnisotropy(unsigned int sampler, float maxAnisotropy);
virtual void setSwizzleR(unsigned int sampler, SwizzleType swizzleR); void setSwizzleR(unsigned int sampler, SwizzleType swizzleR);
virtual void setSwizzleG(unsigned int sampler, SwizzleType swizzleG); void setSwizzleG(unsigned int sampler, SwizzleType swizzleG);
virtual void setSwizzleB(unsigned int sampler, SwizzleType swizzleB); void setSwizzleB(unsigned int sampler, SwizzleType swizzleB);
virtual void setSwizzleA(unsigned int sampler, SwizzleType swizzleA); void setSwizzleA(unsigned int sampler, SwizzleType swizzleA);
virtual void setBaseLevel(unsigned int sampler, int baseLevel); void setBaseLevel(unsigned int sampler, int baseLevel);
virtual void setMaxLevel(unsigned int sampler, int maxLevel); void setMaxLevel(unsigned int sampler, int maxLevel);
virtual void setMinLod(unsigned int sampler, float minLod); void setMinLod(unsigned int sampler, float minLod);
virtual void setMaxLod(unsigned int sampler, float maxLod); void setMaxLod(unsigned int sampler, float maxLod);
virtual void setWriteSRGB(bool sRGB); void setWriteSRGB(bool sRGB);
virtual void setDepthBufferEnable(bool depthBufferEnable); void setDepthBufferEnable(bool depthBufferEnable);
virtual void setDepthCompare(DepthCompareMode depthCompareMode); void setDepthCompare(DepthCompareMode depthCompareMode);
virtual void setAlphaCompare(AlphaCompareMode alphaCompareMode); void setAlphaCompare(AlphaCompareMode alphaCompareMode);
virtual void setDepthWriteEnable(bool depthWriteEnable); void setDepthWriteEnable(bool depthWriteEnable);
virtual void setAlphaTestEnable(bool alphaTestEnable); void setAlphaTestEnable(bool alphaTestEnable);
virtual void setCullMode(CullMode cullMode); void setCullMode(CullMode cullMode);
virtual void setColorWriteMask(int index, int rgbaMask); void setColorWriteMask(int index, int rgbaMask);
virtual void setColorLogicOpEnabled(bool colorLogicOpEnabled); void setColorLogicOpEnabled(bool colorLogicOpEnabled);
virtual void setLogicalOperation(LogicalOperation logicalOperation); void setLogicalOperation(LogicalOperation logicalOperation);
virtual void setStencilEnable(bool stencilEnable); void setStencilEnable(bool stencilEnable);
virtual void setStencilCompare(StencilCompareMode stencilCompareMode); void setStencilCompare(StencilCompareMode stencilCompareMode);
virtual void setStencilReference(int stencilReference); void setStencilReference(int stencilReference);
virtual void setStencilMask(int stencilMask); void setStencilMask(int stencilMask);
virtual void setStencilFailOperation(StencilOperation stencilFailOperation); void setStencilFailOperation(StencilOperation stencilFailOperation);
virtual void setStencilPassOperation(StencilOperation stencilPassOperation); void setStencilPassOperation(StencilOperation stencilPassOperation);
virtual void setStencilZFailOperation(StencilOperation stencilZFailOperation); void setStencilZFailOperation(StencilOperation stencilZFailOperation);
virtual void setStencilWriteMask(int stencilWriteMask); void setStencilWriteMask(int stencilWriteMask);
virtual void setTwoSidedStencil(bool enable); void setTwoSidedStencil(bool enable);
virtual void setStencilCompareCCW(StencilCompareMode stencilCompareMode); void setStencilCompareCCW(StencilCompareMode stencilCompareMode);
virtual void setStencilReferenceCCW(int stencilReference); void setStencilReferenceCCW(int stencilReference);
virtual void setStencilMaskCCW(int stencilMask); void setStencilMaskCCW(int stencilMask);
virtual void setStencilFailOperationCCW(StencilOperation stencilFailOperation); void setStencilFailOperationCCW(StencilOperation stencilFailOperation);
virtual void setStencilPassOperationCCW(StencilOperation stencilPassOperation); void setStencilPassOperationCCW(StencilOperation stencilPassOperation);
virtual void setStencilZFailOperationCCW(StencilOperation stencilZFailOperation); void setStencilZFailOperationCCW(StencilOperation stencilZFailOperation);
virtual void setStencilWriteMaskCCW(int stencilWriteMask); void setStencilWriteMaskCCW(int stencilWriteMask);
virtual void setTextureFactor(const Color<float> &textureFactor); void setTextureFactor(const Color<float> &textureFactor);
virtual void setBlendConstant(const Color<float> &blendConstant); void setBlendConstant(const Color<float> &blendConstant);
virtual void setFillMode(FillMode fillMode); void setFillMode(FillMode fillMode);
virtual void setShadingMode(ShadingMode shadingMode); void setShadingMode(ShadingMode shadingMode);
virtual void setAlphaBlendEnable(bool alphaBlendEnable); void setAlphaBlendEnable(bool alphaBlendEnable);
virtual void setSourceBlendFactor(BlendFactor sourceBlendFactor); void setSourceBlendFactor(BlendFactor sourceBlendFactor);
virtual void setDestBlendFactor(BlendFactor destBlendFactor); void setDestBlendFactor(BlendFactor destBlendFactor);
virtual void setBlendOperation(BlendOperation blendOperation); void setBlendOperation(BlendOperation blendOperation);
virtual void setSeparateAlphaBlendEnable(bool separateAlphaBlendEnable); void setSeparateAlphaBlendEnable(bool separateAlphaBlendEnable);
virtual void setSourceBlendFactorAlpha(BlendFactor sourceBlendFactorAlpha); void setSourceBlendFactorAlpha(BlendFactor sourceBlendFactorAlpha);
virtual void setDestBlendFactorAlpha(BlendFactor destBlendFactorAlpha); void setDestBlendFactorAlpha(BlendFactor destBlendFactorAlpha);
virtual void setBlendOperationAlpha(BlendOperation blendOperationAlpha); void setBlendOperationAlpha(BlendOperation blendOperationAlpha);
virtual void setAlphaReference(float alphaReference); void setAlphaReference(float alphaReference);
virtual void setGlobalMipmapBias(float bias); void setGlobalMipmapBias(float bias);
virtual void setFogStart(float start); void setFogStart(float start);
virtual void setFogEnd(float end); void setFogEnd(float end);
virtual void setFogColor(Color<float> fogColor); void setFogColor(Color<float> fogColor);
virtual void setFogDensity(float fogDensity); void setFogDensity(float fogDensity);
virtual void setPixelFogMode(FogMode fogMode); void setPixelFogMode(FogMode fogMode);
virtual void setPerspectiveCorrection(bool perspectiveCorrection); void setPerspectiveCorrection(bool perspectiveCorrection);
virtual void setOcclusionEnabled(bool enable); void setOcclusionEnabled(bool enable);
protected: protected:
const State update() const; const State update() const;
......
src/Renderer/Renderer.hpp
...@@ -318,73 +318,73 @@ namespace sw ...@@ -318,73 +318,73 @@ namespace sw
virtual ~Renderer(); virtual ~Renderer();
virtual void clear(void* pixel, Format format, Surface *dest, const SliceRect &dRect, unsigned int rgbaMask); void clear(void* pixel, Format format, Surface *dest, const SliceRect &dRect, unsigned int rgbaMask);
virtual void blit(Surface *source, const SliceRect &sRect, Surface *dest, const SliceRect &dRect, bool filter); void blit(Surface *source, const SliceRect &sRect, Surface *dest, const SliceRect &dRect, bool filter);
virtual void blit3D(Surface *source, Surface *dest); void blit3D(Surface *source, Surface *dest);
virtual void draw(DrawType drawType, unsigned int indexOffset, unsigned int count, bool update = true); void draw(DrawType drawType, unsigned int indexOffset, unsigned int count, bool update = true);
virtual void setIndexBuffer(Resource *indexBuffer); void setIndexBuffer(Resource *indexBuffer);
virtual void setMultiSampleMask(unsigned int mask); void setMultiSampleMask(unsigned int mask);
virtual void setTransparencyAntialiasing(TransparencyAntialiasing transparencyAntialiasing); void setTransparencyAntialiasing(TransparencyAntialiasing transparencyAntialiasing);
virtual void setTextureResource(unsigned int sampler, Resource *resource); void setTextureResource(unsigned int sampler, Resource *resource);
virtual void setTextureLevel(unsigned int sampler, unsigned int face, unsigned int level, Surface *surface, TextureType type); void setTextureLevel(unsigned int sampler, unsigned int face, unsigned int level, Surface *surface, TextureType type);
virtual void setTextureFilter(SamplerType type, int sampler, FilterType textureFilter); void setTextureFilter(SamplerType type, int sampler, FilterType textureFilter);
virtual void setMipmapFilter(SamplerType type, int sampler, MipmapType mipmapFilter); void setMipmapFilter(SamplerType type, int sampler, MipmapType mipmapFilter);
virtual void setGatherEnable(SamplerType type, int sampler, bool enable); void setGatherEnable(SamplerType type, int sampler, bool enable);
virtual void setAddressingModeU(SamplerType type, int sampler, AddressingMode addressingMode); void setAddressingModeU(SamplerType type, int sampler, AddressingMode addressingMode);
virtual void setAddressingModeV(SamplerType type, int sampler, AddressingMode addressingMode); void setAddressingModeV(SamplerType type, int sampler, AddressingMode addressingMode);
virtual void setAddressingModeW(SamplerType type, int sampler, AddressingMode addressingMode); void setAddressingModeW(SamplerType type, int sampler, AddressingMode addressingMode);
virtual void setReadSRGB(SamplerType type, int sampler, bool sRGB); void setReadSRGB(SamplerType type, int sampler, bool sRGB);
virtual void setMipmapLOD(SamplerType type, int sampler, float bias); void setMipmapLOD(SamplerType type, int sampler, float bias);
virtual void setBorderColor(SamplerType type, int sampler, const Color<float> &borderColor); void setBorderColor(SamplerType type, int sampler, const Color<float> &borderColor);
virtual void setMaxAnisotropy(SamplerType type, int sampler, float maxAnisotropy); void setMaxAnisotropy(SamplerType type, int sampler, float maxAnisotropy);
virtual void setSwizzleR(SamplerType type, int sampler, SwizzleType swizzleR); void setSwizzleR(SamplerType type, int sampler, SwizzleType swizzleR);
virtual void setSwizzleG(SamplerType type, int sampler, SwizzleType swizzleG); void setSwizzleG(SamplerType type, int sampler, SwizzleType swizzleG);
virtual void setSwizzleB(SamplerType type, int sampler, SwizzleType swizzleB); void setSwizzleB(SamplerType type, int sampler, SwizzleType swizzleB);
virtual void setSwizzleA(SamplerType type, int sampler, SwizzleType swizzleA); void setSwizzleA(SamplerType type, int sampler, SwizzleType swizzleA);
virtual void setBaseLevel(SamplerType type, int sampler, int baseLevel); void setBaseLevel(SamplerType type, int sampler, int baseLevel);
virtual void setMaxLevel(SamplerType type, int sampler, int maxLevel); void setMaxLevel(SamplerType type, int sampler, int maxLevel);
virtual void setMinLod(SamplerType type, int sampler, float minLod); void setMinLod(SamplerType type, int sampler, float minLod);
virtual void setMaxLod(SamplerType type, int sampler, float maxLod); void setMaxLod(SamplerType type, int sampler, float maxLod);
virtual void setPointSpriteEnable(bool pointSpriteEnable); void setPointSpriteEnable(bool pointSpriteEnable);
virtual void setPointScaleEnable(bool pointScaleEnable); void setPointScaleEnable(bool pointScaleEnable);
virtual void setLineWidth(float width); void setLineWidth(float width);
virtual void setDepthBias(float bias); void setDepthBias(float bias);
virtual void setSlopeDepthBias(float slopeBias); void setSlopeDepthBias(float slopeBias);
virtual void setRasterizerDiscard(bool rasterizerDiscard); void setRasterizerDiscard(bool rasterizerDiscard);
// Programmable pipelines // Programmable pipelines
virtual void setPixelShader(const PixelShader *shader); void setPixelShader(const PixelShader *shader);
virtual void setVertexShader(const VertexShader *shader); void setVertexShader(const VertexShader *shader);
virtual void setPixelShaderConstantF(int index, const float value[4], int count = 1); void setPixelShaderConstantF(int index, const float value[4], int count = 1);
virtual void setPixelShaderConstantI(int index, const int value[4], int count = 1); void setPixelShaderConstantI(int index, const int value[4], int count = 1);
virtual void setPixelShaderConstantB(int index, const int *boolean, int count = 1); void setPixelShaderConstantB(int index, const int *boolean, int count = 1);
virtual void setVertexShaderConstantF(int index, const float value[4], int count = 1); void setVertexShaderConstantF(int index, const float value[4], int count = 1);
virtual void setVertexShaderConstantI(int index, const int value[4], int count = 1); void setVertexShaderConstantI(int index, const int value[4], int count = 1);
virtual void setVertexShaderConstantB(int index, const int *boolean, int count = 1); void setVertexShaderConstantB(int index, const int *boolean, int count = 1);
// Viewport & Clipper // Viewport & Clipper
virtual void setViewport(const Viewport &viewport); void setViewport(const Viewport &viewport);
virtual void setScissor(const Rect &scissor); void setScissor(const Rect &scissor);
virtual void setClipFlags(int flags); void setClipFlags(int flags);
virtual void setClipPlane(unsigned int index, const float plane[4]); void setClipPlane(unsigned int index, const float plane[4]);
// Partial transform // Partial transform
virtual void setModelMatrix(const Matrix &M, int i = 0); void setModelMatrix(const Matrix &M, int i = 0);
virtual void setViewMatrix(const Matrix &V); void setViewMatrix(const Matrix &V);
virtual void setBaseMatrix(const Matrix &B); void setBaseMatrix(const Matrix &B);
virtual void setProjectionMatrix(const Matrix &P); void setProjectionMatrix(const Matrix &P);
virtual void addQuery(Query *query); void addQuery(Query *query);
virtual void removeQuery(Query *query); void removeQuery(Query *query);
void synchronize(); void synchronize();
......
src/Renderer/VertexProcessor.hpp
...@@ -185,95 +185,95 @@ namespace sw ...@@ -185,95 +185,95 @@ namespace sw
virtual ~VertexProcessor(); virtual ~VertexProcessor();
virtual void setInputStream(int index, const Stream &stream); void setInputStream(int index, const Stream &stream);
virtual void resetInputStreams(bool preTransformed); void resetInputStreams(bool preTransformed);
virtual void setFloatConstant(unsigned int index, const float value[4]); void setFloatConstant(unsigned int index, const float value[4]);
virtual void setIntegerConstant(unsigned int index, const int integer[4]); void setIntegerConstant(unsigned int index, const int integer[4]);
virtual void setBooleanConstant(unsigned int index, int boolean); void setBooleanConstant(unsigned int index, int boolean);
virtual void setUniformBuffer(int index, sw::Resource* uniformBuffer, int offset); void setUniformBuffer(int index, sw::Resource* uniformBuffer, int offset);
virtual void lockUniformBuffers(byte** u, sw::Resource* uniformBuffers[]); void lockUniformBuffers(byte** u, sw::Resource* uniformBuffers[]);
virtual void setTransformFeedbackBuffer(int index, sw::Resource* transformFeedbackBuffer, int offset, unsigned int reg, unsigned int row, unsigned int col, size_t stride); void setTransformFeedbackBuffer(int index, sw::Resource* transformFeedbackBuffer, int offset, unsigned int reg, unsigned int row, unsigned int col, size_t stride);
virtual void lockTransformFeedbackBuffers(byte** t, unsigned int* v, unsigned int* r, unsigned int* c, unsigned int* s, sw::Resource* transformFeedbackBuffers[]); void lockTransformFeedbackBuffers(byte** t, unsigned int* v, unsigned int* r, unsigned int* c, unsigned int* s, sw::Resource* transformFeedbackBuffers[]);
// Transformations // Transformations
virtual void setModelMatrix(const Matrix &M, int i = 0); void setModelMatrix(const Matrix &M, int i = 0);
virtual void setViewMatrix(const Matrix &V); void setViewMatrix(const Matrix &V);
virtual void setBaseMatrix(const Matrix &B); void setBaseMatrix(const Matrix &B);
virtual void setProjectionMatrix(const Matrix &P); void setProjectionMatrix(const Matrix &P);
// Lighting // Lighting
virtual void setLightingEnable(bool lightingEnable); void setLightingEnable(bool lightingEnable);
virtual void setLightEnable(unsigned int light, bool lightEnable); void setLightEnable(unsigned int light, bool lightEnable);
virtual void setSpecularEnable(bool specularEnable); void setSpecularEnable(bool specularEnable);
virtual void setGlobalAmbient(const Color<float> &globalAmbient); void setGlobalAmbient(const Color<float> &globalAmbient);
virtual void setLightPosition(unsigned int light, const Point &lightPosition); void setLightPosition(unsigned int light, const Point &lightPosition);
virtual void setLightViewPosition(unsigned int light, const Point &lightPosition); void setLightViewPosition(unsigned int light, const Point &lightPosition);
virtual void setLightDiffuse(unsigned int light, const Color<float> &lightDiffuse); void setLightDiffuse(unsigned int light, const Color<float> &lightDiffuse);
virtual void setLightSpecular(unsigned int light, const Color<float> &lightSpecular); void setLightSpecular(unsigned int light, const Color<float> &lightSpecular);
virtual void setLightAmbient(unsigned int light, const Color<float> &lightAmbient); void setLightAmbient(unsigned int light, const Color<float> &lightAmbient);
virtual void setLightAttenuation(unsigned int light, float constant, float linear, float quadratic); void setLightAttenuation(unsigned int light, float constant, float linear, float quadratic);
virtual void setLightRange(unsigned int light, float lightRange); void setLightRange(unsigned int light, float lightRange);
virtual void setInstanceID(int instanceID); void setInstanceID(int instanceID);
virtual void setFogEnable(bool fogEnable); void setFogEnable(bool fogEnable);
virtual void setVertexFogMode(FogMode fogMode); void setVertexFogMode(FogMode fogMode);
virtual void setRangeFogEnable(bool enable); void setRangeFogEnable(bool enable);
virtual void setColorVertexEnable(bool colorVertexEnable); void setColorVertexEnable(bool colorVertexEnable);
virtual void setDiffuseMaterialSource(MaterialSource diffuseMaterialSource); void setDiffuseMaterialSource(MaterialSource diffuseMaterialSource);
virtual void setSpecularMaterialSource(MaterialSource specularMaterialSource); void setSpecularMaterialSource(MaterialSource specularMaterialSource);
virtual void setAmbientMaterialSource(MaterialSource ambientMaterialSource); void setAmbientMaterialSource(MaterialSource ambientMaterialSource);
virtual void setEmissiveMaterialSource(MaterialSource emissiveMaterialSource); void setEmissiveMaterialSource(MaterialSource emissiveMaterialSource);
virtual void setMaterialEmission(const Color<float> &emission); void setMaterialEmission(const Color<float> &emission);
virtual void setMaterialAmbient(const Color<float> &materialAmbient); void setMaterialAmbient(const Color<float> &materialAmbient);
virtual void setMaterialDiffuse(const Color<float> &diffuseColor); void setMaterialDiffuse(const Color<float> &diffuseColor);
virtual void setMaterialSpecular(const Color<float> &specularColor); void setMaterialSpecular(const Color<float> &specularColor);
virtual void setMaterialShininess(float specularPower); void setMaterialShininess(float specularPower);
virtual void setIndexedVertexBlendEnable(bool indexedVertexBlendEnable); void setIndexedVertexBlendEnable(bool indexedVertexBlendEnable);
virtual void setVertexBlendMatrixCount(unsigned int vertexBlendMatrixCount); void setVertexBlendMatrixCount(unsigned int vertexBlendMatrixCount);
virtual void setTextureWrap(unsigned int stage, int mask); void setTextureWrap(unsigned int stage, int mask);
virtual void setTexGen(unsigned int stage, TexGen texGen); void setTexGen(unsigned int stage, TexGen texGen);
virtual void setLocalViewer(bool localViewer); void setLocalViewer(bool localViewer);
virtual void setNormalizeNormals(bool normalizeNormals); void setNormalizeNormals(bool normalizeNormals);
virtual void setTextureMatrix(int stage, const Matrix &T); void setTextureMatrix(int stage, const Matrix &T);
virtual void setTextureTransform(int stage, int count, bool project); void setTextureTransform(int stage, int count, bool project);
virtual void setTextureFilter(unsigned int sampler, FilterType textureFilter); void setTextureFilter(unsigned int sampler, FilterType textureFilter);
virtual void setMipmapFilter(unsigned int sampler, MipmapType mipmapFilter); void setMipmapFilter(unsigned int sampler, MipmapType mipmapFilter);
virtual void setGatherEnable(unsigned int sampler, bool enable); void setGatherEnable(unsigned int sampler, bool enable);
virtual void setAddressingModeU(unsigned int sampler, AddressingMode addressingMode); void setAddressingModeU(unsigned int sampler, AddressingMode addressingMode);
virtual void setAddressingModeV(unsigned int sampler, AddressingMode addressingMode); void setAddressingModeV(unsigned int sampler, AddressingMode addressingMode);
virtual void setAddressingModeW(unsigned int sampler, AddressingMode addressingMode); void setAddressingModeW(unsigned int sampler, AddressingMode addressingMode);
virtual void setReadSRGB(unsigned int sampler, bool sRGB); void setReadSRGB(unsigned int sampler, bool sRGB);
virtual void setMipmapLOD(unsigned int sampler, float bias); void setMipmapLOD(unsigned int sampler, float bias);
virtual void setBorderColor(unsigned int sampler, const Color<float> &borderColor); void setBorderColor(unsigned int sampler, const Color<float> &borderColor);
virtual void setMaxAnisotropy(unsigned int stage, float maxAnisotropy); void setMaxAnisotropy(unsigned int stage, float maxAnisotropy);
virtual void setSwizzleR(unsigned int sampler, SwizzleType swizzleR); void setSwizzleR(unsigned int sampler, SwizzleType swizzleR);
virtual void setSwizzleG(unsigned int sampler, SwizzleType swizzleG); void setSwizzleG(unsigned int sampler, SwizzleType swizzleG);
virtual void setSwizzleB(unsigned int sampler, SwizzleType swizzleB); void setSwizzleB(unsigned int sampler, SwizzleType swizzleB);
virtual void setSwizzleA(unsigned int sampler, SwizzleType swizzleA); void setSwizzleA(unsigned int sampler, SwizzleType swizzleA);
virtual void setBaseLevel(unsigned int sampler, int baseLevel); void setBaseLevel(unsigned int sampler, int baseLevel);
virtual void setMaxLevel(unsigned int sampler, int maxLevel); void setMaxLevel(unsigned int sampler, int maxLevel);
virtual void setMinLod(unsigned int sampler, float minLod); void setMinLod(unsigned int sampler, float minLod);
virtual void setMaxLod(unsigned int sampler, float maxLod); void setMaxLod(unsigned int sampler, float maxLod);
virtual void setPointSize(float pointSize); void setPointSize(float pointSize);
virtual void setPointSizeMin(float pointSizeMin); void setPointSizeMin(float pointSizeMin);
virtual void setPointSizeMax(float pointSizeMax); void setPointSizeMax(float pointSizeMax);
virtual void setPointScaleA(float pointScaleA); void setPointScaleA(float pointScaleA);
virtual void setPointScaleB(float pointScaleB); void setPointScaleB(float pointScaleB);
virtual void setPointScaleC(float pointScaleC); void setPointScaleC(float pointScaleC);
virtual void setTransformFeedbackQueryEnabled(bool enable); void setTransformFeedbackQueryEnabled(bool enable);
virtual void enableTransformFeedback(uint64_t enable); void enableTransformFeedback(uint64_t enable);
protected: protected:
const Matrix &getModelTransform(int i); const Matrix &getModelTransform(int i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment