AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-11 11:50:04 +00:00
Code Issues Releases Wiki Activity
94d2408c15
OpenSubdiv/opensubdiv/osd/d3d11DrawRegistry.cpp

332 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/d3d11DrawRegistry.h"
#include "../osd/error.h"
#include <D3D11.h>
#include <D3Dcompiler.h>
#include <sstream>
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
OsdD3D11DrawConfig::~OsdD3D11DrawConfig()
{
if (vertexShader) vertexShader->Release();
if (hullShader) hullShader->Release();
if (domainShader) domainShader->Release();
if (geometryShader) geometryShader->Release();
if (pixelShader) pixelShader->Release();
}
static const char *commonShaderSource =
#include "hlslPatchCommon.inc"
;
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 =
#include "hlslPtexCommon.inc"
;
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 =
#include "hlslPatchBSpline.inc"
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 =
#include "hlslPatchGregory.inc"
;
static const char *transitionShaderSource =
#include "hlslPatchTransition.inc"
;
OsdD3D11DrawRegistryBase::~OsdD3D11DrawRegistryBase() {}
OsdD3D11DrawSourceConfig *
OsdD3D11DrawRegistryBase::_CreateDrawSourceConfig(
msvc build fixes
2013-05-14 01:43:05 +00:00
OsdDrawContext::PatchDescriptor const & desc, ID3D11Device * pd3dDevice)
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
{
OsdD3D11DrawSourceConfig * sconfig = _NewDrawSourceConfig();
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;
msvc build fixes
2013-05-14 01:43:05 +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("");
msvc build fixes
2013-05-14 01:43:05 +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());
}
msvc build fixes
2013-05-14 01:43:05 +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;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->vertexShader.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main_patches";
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->hullShader.source = bsplineShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->hullShader.target = "hs_5_0";
sconfig->hullShader.entry = "hs_main_patches";
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->domainShader.source = bsplineShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->domainShader.target = "ds_5_0";
sconfig->domainShader.entry = "ds_main_patches";
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;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->vertexShader.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main_patches";
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->hullShader.source = bsplineShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->hullShader.target = "hs_5_0";
sconfig->hullShader.entry = "hs_main_patches";
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->hullShader.AddDefine("OSD_PATCH_BOUNDARY");
sconfig->domainShader.source = bsplineShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->domainShader.target = "ds_5_0";
sconfig->domainShader.entry = "ds_main_patches";
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;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->vertexShader.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main_patches";
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->hullShader.source = bsplineShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->hullShader.target = "hs_5_0";
sconfig->hullShader.entry = "hs_main_patches";
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->hullShader.AddDefine("OSD_PATCH_CORNER");
sconfig->domainShader.source = bsplineShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->domainShader.target = "ds_5_0";
sconfig->domainShader.entry = "ds_main_patches";
break;
case FarPatchTables::GREGORY:
sconfig->vertexShader.source = gregoryShaderSource;
sconfig->vertexShader.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main_patches";
sconfig->hullShader.source = gregoryShaderSource;
sconfig->hullShader.target = "hs_5_0";
sconfig->hullShader.entry = "hs_main_patches";
sconfig->domainShader.source = gregoryShaderSource;
sconfig->domainShader.target = "ds_5_0";
sconfig->domainShader.entry = "ds_main_patches";
break;
case FarPatchTables::GREGORY_BOUNDARY:
Unified HLSL Gregory patch shaders
2013-07-02 07:26:09 +00:00
sconfig->vertexShader.source = gregoryShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->vertexShader.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main_patches";
Unified HLSL Gregory patch shaders
2013-07-02 07:26:09 +00:00
sconfig->vertexShader.AddDefine("OSD_PATCH_GREGORY_BOUNDARY");
sconfig->hullShader.source = gregoryShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->hullShader.target = "hs_5_0";
sconfig->hullShader.entry = "hs_main_patches";
Unified HLSL Gregory patch shaders
2013-07-02 07:26:09 +00:00
sconfig->hullShader.AddDefine("OSD_PATCH_GREGORY_BOUNDARY");
sconfig->domainShader.source = gregoryShaderSource;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->domainShader.target = "ds_5_0";
sconfig->domainShader.entry = "ds_main_patches";
Unified HLSL Gregory patch shaders
2013-07-02 07:26:09 +00:00
sconfig->domainShader.AddDefine("OSD_PATCH_GREGORY_BOUNDARY");
msvc build fixes
2013-05-14 01:43:05 +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
msvc build fixes
2013-05-14 01:43:05 +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.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main_patches";
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->hullShader.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->hullShader.target = "hs_5_0";
sconfig->hullShader.entry = "hs_main_patches";
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->hullShader.AddDefine("OSD_PATCH_TRANSITION");
sconfig->domainShader.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->domainShader.target = "ds_5_0";
sconfig->domainShader.entry = "ds_main_patches";
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->domainShader.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
msvc build fixes
2013-05-14 01:43:05 +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
msvc build fixes
2013-05-14 01:43:05 +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;
msvc build fixes
2013-05-14 01:43:05 +00:00
sconfig->hullShader.AddDefine(ss.str());
sconfig->domainShader.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->hullShader.AddDefine("OSD_TRANSITION_ROTATE", ss.str());
sconfig->domainShader.AddDefine("OSD_TRANSITION_ROTATE", ss.str());
msvc build fixes
2013-05-14 01:43:05 +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->hullShader.AddDefine("OSD_PATCH_BOUNDARY");
msvc build fixes
2013-05-14 01:43:05 +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->hullShader.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
}
}
return sconfig;
}
static ID3DBlob *
_CompileShader(
OsdDrawShaderSource const & common,
OsdDrawShaderSource const & source)
{
DWORD dwShaderFlags = D3DCOMPILE_ENABLE_STRICTNESS;
#ifdef _DEBUG
dwShaderFlags |= D3DCOMPILE_DEBUG;
#endif
ID3DBlob* pBlob = NULL;
ID3DBlob* pBlobError = NULL;
std::vector<D3D_SHADER_MACRO> shaderDefines;
for (int i=0; i<(int)common.defines.size(); ++i) {
const D3D_SHADER_MACRO def = {
common.defines[i].first.c_str(),
common.defines[i].second.c_str(),
};
shaderDefines.push_back(def);
}
for (int i=0; i<(int)source.defines.size(); ++i) {
const D3D_SHADER_MACRO def = {
source.defines[i].first.c_str(),
source.defines[i].second.c_str(),
};
shaderDefines.push_back(def);
}
const D3D_SHADER_MACRO def = { 0, 0 };
shaderDefines.push_back(def);
std::string shaderSource = common.source + source.source;
HRESULT hr = D3DCompile(shaderSource.c_str(), shaderSource.size(),
NULL, &shaderDefines[0], NULL,
source.entry.c_str(), source.target.c_str(),
dwShaderFlags, 0, &pBlob, &pBlobError);
if (FAILED(hr)) {
if ( pBlobError != NULL ) {
OsdError(OSD_D3D11_COMPILE_ERROR,
"Error compiling HLSL shader: %s\n",
(CHAR*)pBlobError->GetBufferPointer());
pBlobError->Release();
return NULL;
}
}
return pBlob;
}
#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
OsdD3D11DrawConfig*
OsdD3D11DrawRegistryBase::_CreateDrawConfig(
DescType const & desc,
SourceConfigType const * sconfig,
ID3D11Device * pd3dDevice,
ID3D11InputLayout ** ppInputLayout,
D3D11_INPUT_ELEMENT_DESC const * pInputElementDescs,
int numInputElements)
{
assert(sconfig);
ID3DBlob * pBlob;
ID3D11VertexShader *vertexShader = NULL;
if (! sconfig->vertexShader.source.empty()) {
pBlob = _CompileShader(sconfig->commonShader, sconfig->vertexShader);
pd3dDevice->CreateVertexShader(pBlob->GetBufferPointer(),
pBlob->GetBufferSize(),
NULL,
&vertexShader);
assert(vertexShader);
if (ppInputLayout and !*ppInputLayout) {
pd3dDevice->CreateInputLayout(pInputElementDescs, numInputElements,
pBlob->GetBufferPointer(),
pBlob->GetBufferSize(), ppInputLayout);
assert(ppInputLayout);
}
SAFE_RELEASE(pBlob);
}
ID3D11HullShader *hullShader = NULL;
if (! sconfig->hullShader.source.empty()) {
pBlob = _CompileShader(sconfig->commonShader, sconfig->hullShader);
pd3dDevice->CreateHullShader(pBlob->GetBufferPointer(),
pBlob->GetBufferSize(),
NULL,
&hullShader);
assert(hullShader);
SAFE_RELEASE(pBlob);
}
ID3D11DomainShader *domainShader = NULL;
if (! sconfig->domainShader.source.empty()) {
pBlob = _CompileShader(sconfig->commonShader, sconfig->domainShader);
pd3dDevice->CreateDomainShader(pBlob->GetBufferPointer(),
pBlob->GetBufferSize(),
NULL,
&domainShader);
assert(domainShader);
SAFE_RELEASE(pBlob);
}
ID3D11GeometryShader *geometryShader = NULL;
if (! sconfig->geometryShader.source.empty()) {
pBlob = _CompileShader(sconfig->commonShader, sconfig->geometryShader);
pd3dDevice->CreateGeometryShader(pBlob->GetBufferPointer(),
pBlob->GetBufferSize(),
NULL,
&geometryShader);
assert(geometryShader);
SAFE_RELEASE(pBlob);
}
ID3D11PixelShader *pixelShader = NULL;
if (! sconfig->pixelShader.source.empty()) {
pBlob = _CompileShader(sconfig->commonShader, sconfig->pixelShader);
pd3dDevice->CreatePixelShader(pBlob->GetBufferPointer(),
pBlob->GetBufferSize(),
NULL,
&pixelShader);
assert(pixelShader);
SAFE_RELEASE(pBlob);
}
OsdD3D11DrawConfig * config = _NewDrawConfig();
config->vertexShader = vertexShader;
config->hullShader = hullShader;
config->domainShader = domainShader;
config->geometryShader = geometryShader;
config->pixelShader = pixelShader;
return config;
}
} // end namespace OPENSUBDIV_VERSION
} // end namespace OpenSubdiv
Reference in New Issue Copy Permalink