From 03434b20cf012f17f80359cd51e35a09ee4b67ba Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 29 Nov 2017 12:22:03 +0000 Subject: [PATCH] Added mapping of GLSL file extension to shader Type. --- src/osgPlugins/glsl/ReaderWriterGLSL.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osgPlugins/glsl/ReaderWriterGLSL.cpp b/src/osgPlugins/glsl/ReaderWriterGLSL.cpp index 9d471decd..3713befd3 100644 --- a/src/osgPlugins/glsl/ReaderWriterGLSL.cpp +++ b/src/osgPlugins/glsl/ReaderWriterGLSL.cpp @@ -203,11 +203,15 @@ class ReaderWriterGLSL : public osgDB::ReaderWriter { // set type based on filename extension, where possible if (ext == "frag") shader->setType(osg::Shader::FRAGMENT); + if (ext == "fs") shader->setType(osg::Shader::FRAGMENT); if (ext == "vert") shader->setType(osg::Shader::VERTEX); + if (ext == "vs") shader->setType(osg::Shader::VERTEX); if (ext == "geom") shader->setType(osg::Shader::GEOMETRY); + if (ext == "gs") shader->setType(osg::Shader::GEOMETRY); if (ext == "tctrl") shader->setType(osg::Shader::TESSCONTROL); if (ext == "teval") shader->setType(osg::Shader::TESSEVALUATION); if (ext == "compute") shader->setType(osg::Shader::COMPUTE); + if (ext == "cs") shader->setType(osg::Shader::COMPUTE); } } return rr;