Merge branch 'NDK-Refactor' into NDK
Conflicts: examples/HardwareInfo/main.cpp include/Nazara/Renderer/Enums.hpp include/Nazara/Renderer/GpuQuery.hpp include/Nazara/Renderer/OpenGL.hpp include/Nazara/Renderer/RenderBuffer.hpp include/Nazara/Renderer/RenderTexture.hpp include/Nazara/Renderer/Texture.hpp src/Nazara/Graphics/AbstractRenderTechnique.cpp src/Nazara/Graphics/DeferredRenderTechnique.cpp src/Nazara/Graphics/Material.cpp src/Nazara/Graphics/SkyboxBackground.cpp src/Nazara/Renderer/GpuQuery.cpp src/Nazara/Renderer/OpenGL.cpp src/Nazara/Renderer/RenderBuffer.cpp src/Nazara/Renderer/RenderTexture.cpp src/Nazara/Renderer/Renderer.cpp src/Nazara/Renderer/Shader.cpp src/Nazara/Renderer/ShaderStage.cpp src/Nazara/Renderer/Texture.cpp Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
This commit is contained in:
Lynix
@@ -7,215 +7,218 @@
|
||||
#ifndef NAZARA_ENUMS_RENDERER_HPP
|
||||
#define NAZARA_ENUMS_RENDERER_HPP
|
||||
|
||||
enum nzAttachmentPoint
|
||||
namespace Nz
|
||||
{
|
||||
nzAttachmentPoint_Color,
|
||||
nzAttachmentPoint_Depth,
|
||||
nzAttachmentPoint_DepthStencil,
|
||||
nzAttachmentPoint_Stencil,
|
||||
enum AttachmentPoint
|
||||
{
|
||||
AttachmentPoint_Color,
|
||||
AttachmentPoint_Depth,
|
||||
AttachmentPoint_DepthStencil,
|
||||
AttachmentPoint_Stencil,
|
||||
|
||||
nzAttachmentPoint_Max = nzAttachmentPoint_Stencil
|
||||
};
|
||||
AttachmentPoint_Max = AttachmentPoint_Stencil
|
||||
};
|
||||
|
||||
enum nzBlendFunc
|
||||
{
|
||||
nzBlendFunc_DestAlpha,
|
||||
nzBlendFunc_DestColor,
|
||||
nzBlendFunc_SrcAlpha,
|
||||
nzBlendFunc_SrcColor,
|
||||
nzBlendFunc_InvDestAlpha,
|
||||
nzBlendFunc_InvDestColor,
|
||||
nzBlendFunc_InvSrcAlpha,
|
||||
nzBlendFunc_InvSrcColor,
|
||||
nzBlendFunc_One,
|
||||
nzBlendFunc_Zero,
|
||||
enum BlendFunc
|
||||
{
|
||||
BlendFunc_DestAlpha,
|
||||
BlendFunc_DestColor,
|
||||
BlendFunc_SrcAlpha,
|
||||
BlendFunc_SrcColor,
|
||||
BlendFunc_InvDestAlpha,
|
||||
BlendFunc_InvDestColor,
|
||||
BlendFunc_InvSrcAlpha,
|
||||
BlendFunc_InvSrcColor,
|
||||
BlendFunc_One,
|
||||
BlendFunc_Zero,
|
||||
|
||||
nzBlendFunc_Max = nzBlendFunc_Zero
|
||||
};
|
||||
BlendFunc_Max = BlendFunc_Zero
|
||||
};
|
||||
|
||||
enum nzFaceFilling
|
||||
{
|
||||
nzFaceFilling_Fill,
|
||||
nzFaceFilling_Line,
|
||||
nzFaceFilling_Point,
|
||||
enum FaceFilling
|
||||
{
|
||||
FaceFilling_Fill,
|
||||
FaceFilling_Line,
|
||||
FaceFilling_Point,
|
||||
|
||||
nzFaceFilling_Max = nzFaceFilling_Point
|
||||
};
|
||||
FaceFilling_Max = FaceFilling_Point
|
||||
};
|
||||
|
||||
enum nzFaceSide
|
||||
{
|
||||
nzFaceSide_Back,
|
||||
nzFaceSide_Front,
|
||||
nzFaceSide_FrontAndBack,
|
||||
enum FaceSide
|
||||
{
|
||||
FaceSide_Back,
|
||||
FaceSide_Front,
|
||||
FaceSide_FrontAndBack,
|
||||
|
||||
nzFaceSide_Max = nzFaceSide_FrontAndBack
|
||||
};
|
||||
FaceSide_Max = FaceSide_FrontAndBack
|
||||
};
|
||||
|
||||
enum nzGpuQueryCondition
|
||||
{
|
||||
nzGpuQueryCondition_Region_NoWait,
|
||||
nzGpuQueryCondition_Region_Wait,
|
||||
nzGpuQueryCondition_NoWait,
|
||||
nzGpuQueryCondition_Wait,
|
||||
enum GpuQueryCondition
|
||||
{
|
||||
GpuQueryCondition_Region_NoWait,
|
||||
GpuQueryCondition_Region_Wait,
|
||||
GpuQueryCondition_NoWait,
|
||||
GpuQueryCondition_Wait,
|
||||
|
||||
nzGpuQueryCondition_Max = nzGpuQueryCondition_Wait
|
||||
};
|
||||
GpuQueryCondition_Max = GpuQueryCondition_Wait
|
||||
};
|
||||
|
||||
enum nzGpuQueryMode
|
||||
{
|
||||
nzGpuQueryMode_AnySamplesPassed,
|
||||
nzGpuQueryMode_AnySamplesPassedConservative,
|
||||
nzGpuQueryMode_PrimitiveGenerated,
|
||||
nzGpuQueryMode_SamplesPassed,
|
||||
nzGpuQueryMode_TimeElapsed,
|
||||
nzGpuQueryMode_TransformFeedbackPrimitivesWritten,
|
||||
enum GpuQueryMode
|
||||
{
|
||||
GpuQueryMode_AnySamplesPassed,
|
||||
GpuQueryMode_AnySamplesPassedConservative,
|
||||
GpuQueryMode_PrimitiveGenerated,
|
||||
GpuQueryMode_SamplesPassed,
|
||||
GpuQueryMode_TimeElapsed,
|
||||
GpuQueryMode_TransformFeedbackPrimitivesWritten,
|
||||
|
||||
nzGpuQueryMode_Max = nzGpuQueryMode_TransformFeedbackPrimitivesWritten
|
||||
};
|
||||
GpuQueryMode_Max = GpuQueryMode_TransformFeedbackPrimitivesWritten
|
||||
};
|
||||
|
||||
enum nzMatrixType
|
||||
{
|
||||
// Matrices de base
|
||||
nzMatrixType_Projection,
|
||||
nzMatrixType_View,
|
||||
nzMatrixType_World,
|
||||
enum MatrixType
|
||||
{
|
||||
// Matrices de base
|
||||
MatrixType_Projection,
|
||||
MatrixType_View,
|
||||
MatrixType_World,
|
||||
|
||||
// Matrices combinées
|
||||
nzMatrixType_ViewProj,
|
||||
nzMatrixType_WorldView,
|
||||
nzMatrixType_WorldViewProj,
|
||||
// Matrices combinées
|
||||
MatrixType_ViewProj,
|
||||
MatrixType_WorldView,
|
||||
MatrixType_WorldViewProj,
|
||||
|
||||
// Matrice inversées
|
||||
nzMatrixType_InvProjection,
|
||||
nzMatrixType_InvView,
|
||||
nzMatrixType_InvViewProj,
|
||||
nzMatrixType_InvWorld,
|
||||
nzMatrixType_InvWorldView,
|
||||
nzMatrixType_InvWorldViewProj,
|
||||
// Matrice inversées
|
||||
MatrixType_InvProjection,
|
||||
MatrixType_InvView,
|
||||
MatrixType_InvViewProj,
|
||||
MatrixType_InvWorld,
|
||||
MatrixType_InvWorldView,
|
||||
MatrixType_InvWorldViewProj,
|
||||
|
||||
nzMatrixType_Max = nzMatrixType_InvWorldViewProj
|
||||
};
|
||||
MatrixType_Max = MatrixType_InvWorldViewProj
|
||||
};
|
||||
|
||||
enum nzPixelBufferType
|
||||
{
|
||||
nzPixelBufferType_Pack,
|
||||
nzPixelBufferType_Unpack,
|
||||
enum PixelBufferType
|
||||
{
|
||||
PixelBufferType_Pack,
|
||||
PixelBufferType_Unpack,
|
||||
|
||||
nzPixelBufferType_Max = nzPixelBufferType_Unpack
|
||||
};
|
||||
PixelBufferType_Max = PixelBufferType_Unpack
|
||||
};
|
||||
|
||||
enum nzRendererCap
|
||||
{
|
||||
nzRendererCap_AnisotropicFilter,
|
||||
nzRendererCap_FP64,
|
||||
nzRendererCap_Instancing,
|
||||
enum RendererCap
|
||||
{
|
||||
RendererCap_AnisotropicFilter,
|
||||
RendererCap_FP64,
|
||||
RendererCap_Instancing,
|
||||
|
||||
nzRendererCap_Max = nzRendererCap_Instancing
|
||||
};
|
||||
RendererCap_Max = RendererCap_Instancing
|
||||
};
|
||||
|
||||
enum nzRendererBufferFlags
|
||||
{
|
||||
nzRendererBuffer_Color = 0x1,
|
||||
nzRendererBuffer_Depth = 0x2,
|
||||
nzRendererBuffer_Stencil = 0x4,
|
||||
enum RendererBufferFlags
|
||||
{
|
||||
RendererBuffer_Color = 0x1,
|
||||
RendererBuffer_Depth = 0x2,
|
||||
RendererBuffer_Stencil = 0x4,
|
||||
|
||||
nzRendererBuffer_Max = nzRendererBuffer_Stencil*2-1
|
||||
};
|
||||
RendererBuffer_Max = RendererBuffer_Stencil*2-1
|
||||
};
|
||||
|
||||
enum nzRendererComparison
|
||||
{
|
||||
nzRendererComparison_Always,
|
||||
nzRendererComparison_Equal,
|
||||
nzRendererComparison_Greater,
|
||||
nzRendererComparison_GreaterOrEqual,
|
||||
nzRendererComparison_Less,
|
||||
nzRendererComparison_LessOrEqual,
|
||||
nzRendererComparison_Never,
|
||||
nzRendererComparison_NotEqual,
|
||||
enum RendererComparison
|
||||
{
|
||||
RendererComparison_Always,
|
||||
RendererComparison_Equal,
|
||||
RendererComparison_Greater,
|
||||
RendererComparison_GreaterOrEqual,
|
||||
RendererComparison_Less,
|
||||
RendererComparison_LessOrEqual,
|
||||
RendererComparison_Never,
|
||||
RendererComparison_NotEqual,
|
||||
|
||||
nzRendererComparison_Max = nzRendererComparison_NotEqual
|
||||
};
|
||||
RendererComparison_Max = RendererComparison_NotEqual
|
||||
};
|
||||
|
||||
enum nzRendererParameter
|
||||
{
|
||||
nzRendererParameter_Blend,
|
||||
nzRendererParameter_ColorWrite,
|
||||
nzRendererParameter_DepthBuffer,
|
||||
nzRendererParameter_DepthWrite,
|
||||
nzRendererParameter_FaceCulling,
|
||||
nzRendererParameter_ScissorTest,
|
||||
nzRendererParameter_StencilTest,
|
||||
enum RendererParameter
|
||||
{
|
||||
RendererParameter_Blend,
|
||||
RendererParameter_ColorWrite,
|
||||
RendererParameter_DepthBuffer,
|
||||
RendererParameter_DepthWrite,
|
||||
RendererParameter_FaceCulling,
|
||||
RendererParameter_ScissorTest,
|
||||
RendererParameter_StencilTest,
|
||||
|
||||
nzRendererParameter_Max = nzRendererParameter_StencilTest
|
||||
};
|
||||
RendererParameter_Max = RendererParameter_StencilTest
|
||||
};
|
||||
|
||||
enum nzSamplerFilter
|
||||
{
|
||||
nzSamplerFilter_Unknown = -1,
|
||||
enum SamplerFilter
|
||||
{
|
||||
SamplerFilter_Unknown = -1,
|
||||
|
||||
nzSamplerFilter_Bilinear,
|
||||
nzSamplerFilter_Nearest,
|
||||
nzSamplerFilter_Trilinear,
|
||||
SamplerFilter_Bilinear,
|
||||
SamplerFilter_Nearest,
|
||||
SamplerFilter_Trilinear,
|
||||
|
||||
nzSamplerFilter_Default,
|
||||
SamplerFilter_Default,
|
||||
|
||||
nzSamplerFilter_Max = nzSamplerFilter_Default
|
||||
};
|
||||
SamplerFilter_Max = SamplerFilter_Default
|
||||
};
|
||||
|
||||
enum nzSamplerWrap
|
||||
{
|
||||
nzSamplerWrap_Unknown = -1,
|
||||
enum SamplerWrap
|
||||
{
|
||||
SamplerWrap_Unknown = -1,
|
||||
|
||||
nzSamplerWrap_Clamp,
|
||||
nzSamplerWrap_MirroredRepeat,
|
||||
nzSamplerWrap_Repeat,
|
||||
SamplerWrap_Clamp,
|
||||
SamplerWrap_MirroredRepeat,
|
||||
SamplerWrap_Repeat,
|
||||
|
||||
nzSamplerWrap_Default,
|
||||
SamplerWrap_Default,
|
||||
|
||||
nzSamplerWrap_Max = nzSamplerWrap_Repeat
|
||||
};
|
||||
SamplerWrap_Max = SamplerWrap_Repeat
|
||||
};
|
||||
|
||||
enum nzShaderUniform
|
||||
{
|
||||
nzShaderUniform_InvProjMatrix,
|
||||
nzShaderUniform_InvTargetSize,
|
||||
nzShaderUniform_InvViewMatrix,
|
||||
nzShaderUniform_InvViewProjMatrix,
|
||||
nzShaderUniform_InvWorldMatrix,
|
||||
nzShaderUniform_InvWorldViewMatrix,
|
||||
nzShaderUniform_InvWorldViewProjMatrix,
|
||||
nzShaderUniform_ProjMatrix,
|
||||
nzShaderUniform_TargetSize,
|
||||
nzShaderUniform_ViewMatrix,
|
||||
nzShaderUniform_ViewProjMatrix,
|
||||
nzShaderUniform_WorldMatrix,
|
||||
nzShaderUniform_WorldViewMatrix,
|
||||
nzShaderUniform_WorldViewProjMatrix,
|
||||
enum ShaderUniform
|
||||
{
|
||||
ShaderUniform_InvProjMatrix,
|
||||
ShaderUniform_InvTargetSize,
|
||||
ShaderUniform_InvViewMatrix,
|
||||
ShaderUniform_InvViewProjMatrix,
|
||||
ShaderUniform_InvWorldMatrix,
|
||||
ShaderUniform_InvWorldViewMatrix,
|
||||
ShaderUniform_InvWorldViewProjMatrix,
|
||||
ShaderUniform_ProjMatrix,
|
||||
ShaderUniform_TargetSize,
|
||||
ShaderUniform_ViewMatrix,
|
||||
ShaderUniform_ViewProjMatrix,
|
||||
ShaderUniform_WorldMatrix,
|
||||
ShaderUniform_WorldViewMatrix,
|
||||
ShaderUniform_WorldViewProjMatrix,
|
||||
|
||||
nzShaderUniform_Max = nzShaderUniform_WorldViewProjMatrix
|
||||
};
|
||||
ShaderUniform_Max = ShaderUniform_WorldViewProjMatrix
|
||||
};
|
||||
|
||||
enum nzShaderStage
|
||||
{
|
||||
nzShaderStage_Fragment,
|
||||
nzShaderStage_Geometry,
|
||||
nzShaderStage_Vertex,
|
||||
enum ShaderStageType
|
||||
{
|
||||
ShaderStageType_Fragment,
|
||||
ShaderStageType_Geometry,
|
||||
ShaderStageType_Vertex,
|
||||
|
||||
nzShaderStage_Max = nzShaderStage_Vertex
|
||||
};
|
||||
ShaderStageType_Max = ShaderStageType_Vertex
|
||||
};
|
||||
|
||||
enum nzStencilOperation
|
||||
{
|
||||
nzStencilOperation_Decrement,
|
||||
nzStencilOperation_DecrementNoClamp,
|
||||
nzStencilOperation_Increment,
|
||||
nzStencilOperation_IncrementNoClamp,
|
||||
nzStencilOperation_Invert,
|
||||
nzStencilOperation_Keep,
|
||||
nzStencilOperation_Replace,
|
||||
nzStencilOperation_Zero,
|
||||
enum StencilOperation
|
||||
{
|
||||
StencilOperation_Decrement,
|
||||
StencilOperation_DecrementNoClamp,
|
||||
StencilOperation_Increment,
|
||||
StencilOperation_IncrementNoClamp,
|
||||
StencilOperation_Invert,
|
||||
StencilOperation_Keep,
|
||||
StencilOperation_Replace,
|
||||
StencilOperation_Zero,
|
||||
|
||||
nzStencilOperation_Max = nzStencilOperation_Zero
|
||||
};
|
||||
StencilOperation_Max = StencilOperation_Zero
|
||||
};
|
||||
}
|
||||
|
||||
#endif // NAZARA_ENUMS_RENDERER_HPP
|
||||
|
||||
Reference in New Issue
Block a user