FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed osg::ComputeDispatch to osg::DispatchCompute to make sure the nameing between GL and OSG is consistent i.e glDispatchCompute -> osg::DispatchCompute

Browse Source 
Updated AUTHORS.txt, NEWS.txt and README.txt for CMakeLists.txt for 3.6.0 release
This commit is contained in:
Robert Osfield
2018-04-07 17:59:55 +01:00
parent 7c7a904315
commit 7ab1208c65
10 changed files with 99 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/CMakeLists.txt
View File

@@ -58,7 +58,7 @@ SET(TARGET_H
${HEADER_PATH}/ColorMaski
${HEADER_PATH}/ColorMatrix
${HEADER_PATH}/ComputeBoundsVisitor
${HEADER_PATH}/ComputeDispatch
${HEADER_PATH}/DispatchCompute
${HEADER_PATH}/ContextData
${HEADER_PATH}/ConvexPlanarOccluder
${HEADER_PATH}/ConvexPlanarPolygon
@@ -273,7 +273,7 @@ SET(TARGET_SRC
ColorMaski.cpp
ColorMatrix.cpp
ComputeBoundsVisitor.cpp
ComputeDispatch.cpp
DispatchCompute.cpp
ContextData.cpp
ConvexPlanarOccluder.cpp
ConvexPlanarPolygon.cpp

6
src/osg/ComputeDispatch.cpp → src/osg/DispatchCompute.cpp
View File

@@ -1,8 +1,8 @@
#include <osg/ComputeDispatch>
#include <osg/DispatchCompute>
using namespace osg;
ComputeDispatch::ComputeDispatch(const ComputeDispatch&o,const osg::CopyOp& copyop):
DispatchCompute::DispatchCompute(const DispatchCompute&o,const osg::CopyOp& copyop):
Drawable(o,copyop),
_numGroupsX(o._numGroupsX),
_numGroupsY(o._numGroupsY),
@@ -10,7 +10,7 @@ ComputeDispatch::ComputeDispatch(const ComputeDispatch&o,const osg::CopyOp& copy
{
}
void ComputeDispatch::drawImplementation(RenderInfo& renderInfo) const
void DispatchCompute::drawImplementation(RenderInfo& renderInfo) const
{
renderInfo.getState()->get<GLExtensions>()->glDispatchCompute(_numGroupsX, _numGroupsY, _numGroupsZ);
}

16
src/osgWrappers/serializers/osg/ComputeDispatch.cpp → src/osgWrappers/serializers/osg/DispatchCompute.cpp
View File

@@ -1,17 +1,17 @@
#include <osg/ComputeDispatch>
#include <osg/DispatchCompute>
#include <osgDB/ObjectWrapper>
#include <osgDB/InputStream>
#include <osgDB/OutputStream>
// _numGroupsX/Y/Z
static bool checkComputeGroups( const osg::ComputeDispatch& attr )
static bool checkComputeGroups( const osg::DispatchCompute& attr )
{
GLint numX = 0, numY = 0, numZ = 0;
attr.getComputeGroups( numX, numY, numZ );
return numX>0 && numY>0 && numZ>0;
}
static bool readComputeGroups( osgDB::InputStream& is, osg::ComputeDispatch& attr )
static bool readComputeGroups( osgDB::InputStream& is, osg::DispatchCompute& attr )
{
GLint numX = 0, numY = 0, numZ = 0;
is >> numX >> numY >> numZ;
@@ -19,7 +19,7 @@ static bool readComputeGroups( osgDB::InputStream& is, osg::ComputeDispatch& att
return true;
}
static bool writeComputeGroups( osgDB::OutputStream& os, const osg::ComputeDispatch& attr )
static bool writeComputeGroups( osgDB::OutputStream& os, const osg::DispatchCompute& attr )
{
GLint numX = 0, numY = 0, numZ = 0;
attr.getComputeGroups( numX, numY, numZ );
@@ -27,10 +27,10 @@ static bool writeComputeGroups( osgDB::OutputStream& os, const osg::ComputeDispa
return true;
}
REGISTER_OBJECT_WRAPPER( ComputeDispatch,
new osg::ComputeDispatch,
osg::ComputeDispatch,
"osg::Object osg::Node osg::Drawable osg::ComputeDispatch" )
REGISTER_OBJECT_WRAPPER( DispatchCompute,
new osg::DispatchCompute,
osg::DispatchCompute,
"osg::Object osg::Node osg::Drawable osg::DispatchCompute" )
{
ADD_USER_SERIALIZER( ComputeGroups ); // _numGroupsX/Y/Z
}