encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove outdated backbuffer hack + reduce GL version to 4.4 (#100)

This commit is contained in:
Kai Ninomiya 2017-07-31 11:25:06 -07:00 committed by GitHub
parent 4122b2e3f9
commit 4526368263
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/d3d12/FramebufferD3D12.cpp
View File

@ -29,11 +29,6 @@ namespace d3d12 {
attachmentHeapIndices.resize(renderPass->GetAttachmentCount()); attachmentHeapIndices.resize(renderPass->GetAttachmentCount());
for (uint32_t attachment = 0; attachment < renderPass->GetAttachmentCount(); ++attachment) { for (uint32_t attachment = 0; attachment < renderPass->GetAttachmentCount(); ++attachment) {
auto* textureView = GetTextureView(attachment); auto* textureView = GetTextureView(attachment);
if (!textureView) {
// TODO(kainino@chromium.org): null=backbuffer hack
attachmentHeapIndices[attachment] = rtvCount++;
continue;
}
auto format = textureView->GetTexture()->GetFormat(); auto format = textureView->GetTexture()->GetFormat();
if (TextureFormatHasDepth(format) || TextureFormatHasStencil(format)) { if (TextureFormatHasDepth(format) || TextureFormatHasStencil(format)) {
attachmentHeapIndices[attachment] = dsvCount++; attachmentHeapIndices[attachment] = dsvCount++;
@ -54,9 +49,6 @@ namespace d3d12 {
for (uint32_t attachment = 0; attachment < renderPass->GetAttachmentCount(); ++attachment) { for (uint32_t attachment = 0; attachment < renderPass->GetAttachmentCount(); ++attachment) {
uint32_t heapIndex = attachmentHeapIndices[attachment]; uint32_t heapIndex = attachmentHeapIndices[attachment];
auto* textureView = GetTextureView(attachment); auto* textureView = GetTextureView(attachment);
if (!textureView) {
continue;
}
ComPtr<ID3D12Resource> texture = ToBackend(textureView->GetTexture())->GetD3D12Resource(); ComPtr<ID3D12Resource> texture = ToBackend(textureView->GetTexture())->GetD3D12Resource();
auto format = textureView->GetTexture()->GetFormat(); auto format = textureView->GetTexture()->GetFormat();

2
src/backend/opengl/ShaderModuleGL.cpp
View File

@ -54,7 +54,7 @@ namespace opengl {
#if defined(NXT_PLATFORM_APPLE) #if defined(NXT_PLATFORM_APPLE)
options.version = 410; options.version = 410;
#else #else
options.version = 450; options.version = 440;
#endif #endif
compiler.set_options(options); compiler.set_options(options);

2
src/utils/OpenGLBinding.cpp
View File

@ -122,7 +122,7 @@ namespace utils {
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
#else #else
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 5); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 4);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE); glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
#endif #endif