]> OCCT Git - occt-copy.git/commit
0029074: Visualization, TKOpenGl - support Geometry Shader definition
authorkgv <kgv@opencascade.com>
Sat, 17 Mar 2018 11:19:07 +0000 (14:19 +0300)
committerkgv <kgv@opencascade.com>
Sat, 17 Mar 2018 12:30:05 +0000 (15:30 +0300)
commit7735e9062c812fe6cd5dc6f1d7e52b85c85ea12f
treeb78a4f120bf93f20e1b663b3d91f433757076450
parent0c6bd3af32b182191924f0d307590a6a80fa5ae0
0029074: Visualization, TKOpenGl - support Geometry Shader definition

Graphic3d_TypeOfShaderObject enumeration has been extended by Geometry shader object type.
OpenGl_ShaderProgram::Initialize() processes new shader object types when supported by OpenGL version.
Declarations.glsl has been fixed so that occFragColor is defined only for
Fragment Shader object only (by handling new FRAGMENT_SHADER macros).

Improved documentation of Graphic3d_ArrayOfPrimitives class.

vshader Draw Harness command has been extended to support definition
of Shader Object types other than Vertex and Fragment shader.

# Conflicts:
# src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
60 files changed:
src/Graphic3d/FILES
src/Graphic3d/Graphic3d_ArrayOfPoints.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfPoints.hxx
src/Graphic3d/Graphic3d_ArrayOfPolygons.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfPolygons.hxx
src/Graphic3d/Graphic3d_ArrayOfPolylines.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfPolylines.hxx
src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.hxx
src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfQuadrangles.hxx
src/Graphic3d/Graphic3d_ArrayOfSegments.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfSegments.hxx
src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfTriangleFans.hxx
src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
src/Graphic3d/Graphic3d_ArrayOfTriangles.cxx [deleted file]
src/Graphic3d/Graphic3d_ArrayOfTriangles.hxx
src/Graphic3d/Graphic3d_TypeOfPrimitiveArray.hxx
src/Graphic3d/Graphic3d_TypeOfShaderObject.hxx
src/OpenGl/OpenGl_CappingAlgo.cxx
src/OpenGl/OpenGl_GlFunctions.hxx
src/OpenGl/OpenGl_LayerList.cxx
src/OpenGl/OpenGl_PrimitiveArray.cxx
src/OpenGl/OpenGl_PrimitiveArray.hxx
src/OpenGl/OpenGl_ShaderProgram.cxx
src/OpenGl/OpenGl_ShaderProgram.hxx
src/Prs3d/Prs3d_Drawer.cxx
src/Prs3d/Prs3d_Drawer.hxx
src/Shaders/Declarations.glsl
src/Shaders/Shaders_Declarations_glsl.pxx
src/ViewerTest/ViewerTest_OpenGlCommands.cxx
tests/v3d/glsl/begin [deleted file]
tests/v3d/glsl/geom1 [new file with mode: 0644]
tests/v3d/glsl/gouraud_dir1
tests/v3d/glsl/gouraud_dir2
tests/v3d/glsl/gouraud_pos1
tests/v3d/glsl/gouraud_spot1
tests/v3d/glsl/light_off
tests/v3d/glsl/phong_box
tests/v3d/glsl/phong_couple
tests/v3d/glsl/phong_dir1
tests/v3d/glsl/phong_dir2
tests/v3d/glsl/phong_fuse
tests/v3d/glsl/phong_fuse2
tests/v3d/glsl/phong_plastic
tests/v3d/glsl/phong_pos1
tests/v3d/glsl/phong_sides
tests/v3d/glsl/phong_spot1
tests/v3d/glsl/phong_views
tests/v3d/glsl/rendscale
tests/v3d/glsl/stereo
tests/v3d/glsl/stipple_line
tests/v3d/glsl/tess1 [new file with mode: 0644]
tests/v3d/glsl/texture_multi1
tests/v3d/glsl/texture_trsf
tests/v3d/glsl/tiles