AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-30 07:10:07 +00:00
Code Issues Releases Wiki Activity
727077a8e0
OpenSubdiv/opensubdiv/osd/glDrawRegistry.cpp

311 lines
12 KiB
C++
Raw Normal View History

Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// Copyright 2013 Pixar
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// Licensed under the Apache License, Version 2.0 (the "Apache License")
// with the following modification; you may not use this file except in
// compliance with the Apache License and the following modification to it:
// Section 6. Trademarks. is deleted and replaced with:
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// 6. Trademarks. This License does not grant permission to use the trade
// names, trademarks, service marks, or product names of the Licensor
// and its affiliates, except as required to comply with Section 4(c) of
// the License and to reproduce the content of the NOTICE file.
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// You may obtain a copy of the Apache License at
Updating EULA
2013-07-18 21:19:50 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// http://www.apache.org/licenses/LICENSE-2.0
Updating EULA
2013-07-18 21:19:50 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// Unless required by applicable law or agreed to in writing, software
// distributed under the Apache License with the above modification is
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the Apache License for the specific
// language governing permissions and limitations under the Apache License.
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
#include "../osd/glDrawRegistry.h"
#include "../osd/error.h"
Consolidated OpenGL includes into osd/opengl.h
2013-06-10 22:54:40 +00:00
#include "../osd/opengl.h"
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
#include <sstream>
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
OsdGLDrawConfig::~OsdGLDrawConfig()
{
glDeleteProgram(program);
}
Updated to support GLES 2.0 on iOS and Android
2012-12-20 18:25:41 +00:00
#if defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0)
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
static const char *commonShaderSource =
Use obj targets for faster CPU/GPU lib builds Further leverage cmake object libraries to share object files for CPU and GPU OSD libraries, avoiding duplicate complation for dynamic/static build passes. CMake restricts object library inputs to header and source files, so the .inc files were renamed to .gen.h (which seems like a better name anyway) to make CMake happy. Also updated the .gitignore file to ignore .gen.h files. Conflicts: opensubdiv/osd/CMakeLists.txt
2013-12-24 06:30:34 +00:00
#include "glslPatchCommon.gen.h"
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
;
Refactoring Ptex Mipmap and Analytic Displacement code Moving Takahito's implementation into the core API: - added <gl/d3d11>PtexCommon.<glsl/hlsl> shader code - added control to enable Ptex common trunk in <gl/d3d11>DrawRegistryBase classes - fixed GL & D3D11 ptexViewer examples to use the new API
2013-11-20 23:47:59 +00:00
static const char *ptexShaderSource =
Use obj targets for faster CPU/GPU lib builds Further leverage cmake object libraries to share object files for CPU and GPU OSD libraries, avoiding duplicate complation for dynamic/static build passes. CMake restricts object library inputs to header and source files, so the .inc files were renamed to .gen.h (which seems like a better name anyway) to make CMake happy. Also updated the .gitignore file to ignore .gen.h files. Conflicts: opensubdiv/osd/CMakeLists.txt
2013-12-24 06:30:34 +00:00
#include "glslPtexCommon.gen.h"
Refactoring Ptex Mipmap and Analytic Displacement code Moving Takahito's implementation into the core API: - added <gl/d3d11>PtexCommon.<glsl/hlsl> shader code - added control to enable Ptex common trunk in <gl/d3d11>DrawRegistryBase classes - fixed GL & D3D11 ptexViewer examples to use the new API
2013-11-20 23:47:59 +00:00
;
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
static const char *bsplineShaderSource =
Use obj targets for faster CPU/GPU lib builds Further leverage cmake object libraries to share object files for CPU and GPU OSD libraries, avoiding duplicate complation for dynamic/static build passes. CMake restricts object library inputs to header and source files, so the .inc files were renamed to .gen.h (which seems like a better name anyway) to make CMake happy. Also updated the .gitignore file to ignore .gen.h files. Conflicts: opensubdiv/osd/CMakeLists.txt
2013-12-24 06:30:34 +00:00
#include "glslPatchBSpline.gen.h"
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
;
static const char *gregoryShaderSource =
Use obj targets for faster CPU/GPU lib builds Further leverage cmake object libraries to share object files for CPU and GPU OSD libraries, avoiding duplicate complation for dynamic/static build passes. CMake restricts object library inputs to header and source files, so the .inc files were renamed to .gen.h (which seems like a better name anyway) to make CMake happy. Also updated the .gitignore file to ignore .gen.h files. Conflicts: opensubdiv/osd/CMakeLists.txt
2013-12-24 06:30:34 +00:00
#include "glslPatchGregory.gen.h"
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
;
static const char *transitionShaderSource =
Use obj targets for faster CPU/GPU lib builds Further leverage cmake object libraries to share object files for CPU and GPU OSD libraries, avoiding duplicate complation for dynamic/static build passes. CMake restricts object library inputs to header and source files, so the .inc files were renamed to .gen.h (which seems like a better name anyway) to make CMake happy. Also updated the .gitignore file to ignore .gen.h files. Conflicts: opensubdiv/osd/CMakeLists.txt
2013-12-24 06:30:34 +00:00
#include "glslPatchTransition.gen.h"
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
;
Updated to support GLES 2.0 on iOS and Android
2012-12-20 18:25:41 +00:00
#endif
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
OsdGLDrawRegistryBase::~OsdGLDrawRegistryBase() {}
OsdGLDrawSourceConfig *
Refactoring Ptex Mipmap and Analytic Displacement code Moving Takahito's implementation into the core API: - added <gl/d3d11>PtexCommon.<glsl/hlsl> shader code - added control to enable Ptex common trunk in <gl/d3d11>DrawRegistryBase classes - fixed GL & D3D11 ptexViewer examples to use the new API
2013-11-20 23:47:59 +00:00
OsdGLDrawRegistryBase::_CreateDrawSourceConfig(
OsdDrawContext::PatchDescriptor const & desc)
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
{
OsdGLDrawSourceConfig * sconfig = _NewDrawSourceConfig();
Updated to support GLES 2.0 on iOS and Android
2012-12-20 18:25:41 +00:00
#if defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0)
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sconfig->commonShader.source = commonShaderSource;
Refactoring Ptex Mipmap and Analytic Displacement code Moving Takahito's implementation into the core API: - added <gl/d3d11>PtexCommon.<glsl/hlsl> shader code - added control to enable Ptex common trunk in <gl/d3d11>DrawRegistryBase classes - fixed GL & D3D11 ptexViewer examples to use the new API
2013-11-20 23:47:59 +00:00
if (IsPtexEnabled()) {
sconfig->commonShader.source += ptexShaderSource;
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
{
std::ostringstream ss;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
ss << (int)desc.GetMaxValence();
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sconfig->commonShader.AddDefine("OSD_MAX_VALENCE", ss.str());
ss.str("");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
ss << (int)desc.GetNumElements();
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sconfig->commonShader.AddDefine("OSD_NUM_ELEMENTS", ss.str());
}
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
if (desc.GetPattern() == FarPatchTables::NON_TRANSITION) {
switch (desc.GetType()) {
case FarPatchTables::REGULAR:
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->vertexShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.AddDefine("OSD_PATCH_VERTEX_BSPLINE_SHADER");
sconfig->tessControlShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessControlShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_TESS_CONTROL_BSPLINE_SHADER");
sconfig->tessEvalShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessEvalShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessEvalShader.AddDefine("OSD_PATCH_TESS_EVAL_BSPLINE_SHADER");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
break;
case FarPatchTables::BOUNDARY:
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->vertexShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.AddDefine("OSD_PATCH_VERTEX_BSPLINE_SHADER");
sconfig->tessControlShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessControlShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_TESS_CONTROL_BSPLINE_SHADER");
sconfig->tessControlShader.AddDefine("OSD_PATCH_BOUNDARY");
sconfig->tessEvalShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessEvalShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessEvalShader.AddDefine("OSD_PATCH_TESS_EVAL_BSPLINE_SHADER");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
break;
case FarPatchTables::CORNER:
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->vertexShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.AddDefine("OSD_PATCH_VERTEX_BSPLINE_SHADER");
sconfig->tessControlShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessControlShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_TESS_CONTROL_BSPLINE_SHADER");
sconfig->tessControlShader.AddDefine("OSD_PATCH_CORNER");
sconfig->tessEvalShader.source = bsplineShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessEvalShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessEvalShader.AddDefine("OSD_PATCH_TESS_EVAL_BSPLINE_SHADER");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
break;
case FarPatchTables::GREGORY:
sconfig->vertexShader.source = gregoryShaderSource;
sconfig->vertexShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.AddDefine("OSD_PATCH_VERTEX_GREGORY_SHADER");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessControlShader.source = gregoryShaderSource;
sconfig->tessControlShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_TESS_CONTROL_GREGORY_SHADER");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessEvalShader.source = gregoryShaderSource;
sconfig->tessEvalShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessEvalShader.AddDefine("OSD_PATCH_TESS_EVAL_GREGORY_SHADER");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
break;
case FarPatchTables::GREGORY_BOUNDARY:
Unified GLSL Gregory patch shaders
2013-07-01 18:58:28 +00:00
sconfig->vertexShader.source = gregoryShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->vertexShader.version = "#version 410\n";
Unified GLSL Gregory patch shaders
2013-07-01 18:58:28 +00:00
sconfig->vertexShader.AddDefine("OSD_PATCH_VERTEX_GREGORY_SHADER");
sconfig->vertexShader.AddDefine("OSD_PATCH_GREGORY_BOUNDARY");
sconfig->tessControlShader.source = gregoryShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessControlShader.version = "#version 410\n";
Unified GLSL Gregory patch shaders
2013-07-01 18:58:28 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_TESS_CONTROL_GREGORY_SHADER");
sconfig->tessControlShader.AddDefine("OSD_PATCH_GREGORY_BOUNDARY");
sconfig->tessEvalShader.source = gregoryShaderSource;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessEvalShader.version = "#version 410\n";
Unified GLSL Gregory patch shaders
2013-07-01 18:58:28 +00:00
sconfig->tessEvalShader.AddDefine("OSD_PATCH_TESS_EVAL_GREGORY_SHADER");
sconfig->tessEvalShader.AddDefine("OSD_PATCH_GREGORY_BOUNDARY");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
break;
Returns the common shader config for all non-tess patcharrays.
2013-11-08 18:46:41 +00:00
default: // POINTS, LINES, QUADS, TRIANGLES
// do nothing
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
break;
}
} else { // pattern != NON_TRANSITION
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.source = bsplineShaderSource;
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sconfig->vertexShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->vertexShader.AddDefine("OSD_PATCH_VERTEX_BSPLINE_SHADER");
sconfig->tessControlShader.source =
std::string(transitionShaderSource) + bsplineShaderSource;
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sconfig->tessControlShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_TESS_CONTROL_BSPLINE_SHADER");
sconfig->tessControlShader.AddDefine("OSD_PATCH_TRANSITION");
sconfig->tessEvalShader.source =
std::string(transitionShaderSource) + bsplineShaderSource;
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sconfig->tessEvalShader.version = "#version 410\n";
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessEvalShader.AddDefine("OSD_PATCH_TESS_EVAL_BSPLINE_SHADER");
sconfig->tessEvalShader.AddDefine("OSD_PATCH_TRANSITION");
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
int pattern = desc.GetPattern() - 1;
int rotation = desc.GetRotation();
int subpatch = desc.GetSubPatch();
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
std::ostringstream ss;
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
ss << "OSD_TRANSITION_PATTERN" << pattern << subpatch;
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
sconfig->tessControlShader.AddDefine(ss.str());
sconfig->tessEvalShader.AddDefine(ss.str());
ss.str("");
ss << rotation;
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_TRANSITION_ROTATE", ss.str());
sconfig->tessEvalShader.AddDefine("OSD_TRANSITION_ROTATE", ss.str());
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
if (desc.GetType() == FarPatchTables::BOUNDARY) {
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_BOUNDARY");
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
} else if (desc.GetType() == FarPatchTables::CORNER) {
Partial cleanup of bicubic patch shader source - Added OSD_ prefix to preprocessor symbols - Adjusted transition sub-patch parameterization to be consistent with non-transition patches - Unified BSpline shader code - Removed duplicate Boundary, Corner, and Transition shader source - Fixed a few discrepancies in the remaining duplicate code paths
2013-06-24 19:03:57 +00:00
sconfig->tessControlShader.AddDefine("OSD_PATCH_CORNER");
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
}
}
Updated to support GLES 2.0 on iOS and Android
2012-12-20 18:25:41 +00:00
#endif
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
return sconfig;
}
static GLuint
_CompileShader(
GLenum shaderType,
OpenSubdiv::OsdDrawShaderSource const & common,
OpenSubdiv::OsdDrawShaderSource const & source)
{
const char *sources[4];
std::stringstream definitions;
for (int i=0; i<(int)common.defines.size(); ++i) {
definitions << "#define "
<< common.defines[i].first << " "
<< common.defines[i].second << "\n";
}
for (int i=0; i<(int)source.defines.size(); ++i) {
definitions << "#define "
<< source.defines[i].first << " "
<< source.defines[i].second << "\n";
}
std::string defString = definitions.str();
Remove deprecated GL calls, comply with 4.2/3.3 core profile. Use VAO, update glsl shaders, remove immediate draws, etc. In example code, GLUT has been replaced with GLFW so that glViewer/ptexViewer can run on OSX (10.7 or later). OSX note: still have some problem with clang, may need to explicitly specify gcc on cmake cmdline -DCMAKE_CXX_COMPILE=/usr/bin/g++ fixes #98
2013-01-29 23:54:18 +00:00
sources[0] = source.version.c_str();
sources[1] = defString.c_str();
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sources[2] = common.source.c_str();
sources[3] = source.source.c_str();
GLuint shader = glCreateShader(shaderType);
glShaderSource(shader, 4, sources, NULL);
glCompileShader(shader);
GLint status;
glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
if( status == GL_FALSE ) {
GLint infoLogLength;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
char * infoLog = new char[infoLogLength];
glGetShaderInfoLog(shader, infoLogLength, NULL, infoLog);
OsdError(OSD_GLSL_COMPILE_ERROR,
"Error compiling GLSL shader: %s\nDefines: \n%s\n",
infoLog, defString.c_str());
delete[] infoLog;
}
return shader;
}
OsdGLDrawConfig *
OsdGLDrawRegistryBase::_CreateDrawConfig(
split patch descriptor into two parts, far intrinsic properties and osd's. more OsdGLDrawContext clean up.
2013-05-09 20:14:02 +00:00
OsdDrawContext::PatchDescriptor const & desc,
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
OsdGLDrawSourceConfig const * sconfig)
{
assert(sconfig);
OsdGLDrawConfig * config = _NewDrawConfig();
assert(config);
GLuint vertexShader =
sconfig->vertexShader.source.empty() ? 0 :
_CompileShader(GL_VERTEX_SHADER,
sconfig->commonShader, sconfig->vertexShader);
GLuint tessControlShader = 0;
GLuint tessEvalShader = 0;
#if defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0)
tessControlShader =
sconfig->tessControlShader.source.empty() ? 0 :
_CompileShader(GL_TESS_CONTROL_SHADER,
sconfig->commonShader, sconfig->tessControlShader);
tessEvalShader =
sconfig->tessEvalShader.source.empty() ? 0 :
_CompileShader(GL_TESS_EVALUATION_SHADER,
sconfig->commonShader, sconfig->tessEvalShader);
#endif
Updated to support GLES 2.0 on iOS and Android
2012-12-20 18:25:41 +00:00
GLuint geometryShader = 0;
#if defined(GL_ARB_geometry_shader4) || defined(GL_VERSION_3_1)
geometryShader =
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
sconfig->geometryShader.source.empty() ? 0 :
_CompileShader(GL_GEOMETRY_SHADER,
sconfig->commonShader, sconfig->geometryShader);
Updated to support GLES 2.0 on iOS and Android
2012-12-20 18:25:41 +00:00
#endif
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
GLuint fragmentShader =
sconfig->fragmentShader.source.empty() ? 0 :
_CompileShader(GL_FRAGMENT_SHADER,
sconfig->commonShader, sconfig->fragmentShader);
GLuint program = glCreateProgram();
if (vertexShader) glAttachShader(program, vertexShader);
if (tessControlShader) glAttachShader(program, tessControlShader);
if (tessEvalShader) glAttachShader(program, tessEvalShader);
if (geometryShader) glAttachShader(program, geometryShader);
if (fragmentShader) glAttachShader(program, fragmentShader);
glLinkProgram(program);
glDeleteShader(vertexShader);
glDeleteShader(tessControlShader);
glDeleteShader(tessEvalShader);
glDeleteShader(geometryShader);
glDeleteShader(fragmentShader);
GLint status;
glGetProgramiv(program, GL_LINK_STATUS, &status );
if( status == GL_FALSE ) {
GLint infoLogLength;
glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infoLogLength);
char * infoLog = new char[infoLogLength];
glGetProgramInfoLog(program, infoLogLength, NULL, infoLog);
OsdGLDrawRegistry : fixing an OSD error message prefix when program linking fails
2013-06-19 19:59:43 +00:00
OsdError(OSD_GLSL_LINK_ERROR,
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
"Error linking GLSL program: %s\n", infoLog);
delete[] infoLog;
}
config->program = program;
return config;
}
} // end namespace OPENSUBDIV_VERSION
} // end namespace OpenSubdiv
Reference in New Issue Copy Permalink