Remove outdated backbuffer hack + reduce GL version to 4.4 (#100)
This commit is contained in:
parent
4122b2e3f9
commit
4526368263
|
@ -29,11 +29,6 @@ namespace d3d12 {
|
|||
attachmentHeapIndices.resize(renderPass->GetAttachmentCount());
|
||||
for (uint32_t attachment = 0; attachment < renderPass->GetAttachmentCount(); ++attachment) {
|
||||
auto* textureView = GetTextureView(attachment);
|
||||
if (!textureView) {
|
||||
// TODO(kainino@chromium.org): null=backbuffer hack
|
||||
attachmentHeapIndices[attachment] = rtvCount++;
|
||||
continue;
|
||||
}
|
||||
auto format = textureView->GetTexture()->GetFormat();
|
||||
if (TextureFormatHasDepth(format) || TextureFormatHasStencil(format)) {
|
||||
attachmentHeapIndices[attachment] = dsvCount++;
|
||||
|
@ -54,9 +49,6 @@ namespace d3d12 {
|
|||
for (uint32_t attachment = 0; attachment < renderPass->GetAttachmentCount(); ++attachment) {
|
||||
uint32_t heapIndex = attachmentHeapIndices[attachment];
|
||||
auto* textureView = GetTextureView(attachment);
|
||||
if (!textureView) {
|
||||
continue;
|
||||
}
|
||||
|
||||
ComPtr<ID3D12Resource> texture = ToBackend(textureView->GetTexture())->GetD3D12Resource();
|
||||
auto format = textureView->GetTexture()->GetFormat();
|
||||
|
|
|
@ -54,7 +54,7 @@ namespace opengl {
|
|||
#if defined(NXT_PLATFORM_APPLE)
|
||||
options.version = 410;
|
||||
#else
|
||||
options.version = 450;
|
||||
options.version = 440;
|
||||
#endif
|
||||
compiler.set_options(options);
|
||||
|
||||
|
|
|
@ -122,7 +122,7 @@ namespace utils {
|
|||
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||
#else
|
||||
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_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue