Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: src/gpu/vk/GrVkGpu.cpp

Issue 1864303002: Switch uniforms to be descriptor set 0 in Vulkan (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrVkGpu.h" 8 #include "GrVkGpu.h"
9 9
10 #include "GrContextOptions.h" 10 #include "GrContextOptions.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #ifdef ENABLE_VK_LAYERS 91 #ifdef ENABLE_VK_LAYERS
92 if (backendCtx->fExtensions & kEXT_debug_report_GrVkExtensionFlag) { 92 if (backendCtx->fExtensions & kEXT_debug_report_GrVkExtensionFlag) {
93 // Setup callback creation information 93 // Setup callback creation information
94 VkDebugReportCallbackCreateInfoEXT callbackCreateInfo; 94 VkDebugReportCallbackCreateInfoEXT callbackCreateInfo;
95 callbackCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EX T; 95 callbackCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EX T;
96 callbackCreateInfo.pNext = nullptr; 96 callbackCreateInfo.pNext = nullptr;
97 callbackCreateInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | 97 callbackCreateInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT |
98 VK_DEBUG_REPORT_WARNING_BIT_EXT;// | 98 VK_DEBUG_REPORT_WARNING_BIT_EXT;// |
99 //VK_DEBUG_REPORT_INFORMATION_BIT_EXT | 99 //VK_DEBUG_REPORT_INFORMATION_BIT_EXT |
100 //VK_DEBUG_REPORT_DEBUG_BIT_EXT | 100 //VK_DEBUG_REPORT_DEBUG_BIT_EXT |
101 //VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT ; 101 VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT;
102 callbackCreateInfo.pfnCallback = &DebugReportCallback; 102 callbackCreateInfo.pfnCallback = &DebugReportCallback;
103 callbackCreateInfo.pUserData = nullptr; 103 callbackCreateInfo.pUserData = nullptr;
104 104
105 // Register the callback 105 // Register the callback
106 GR_VK_CALL_ERRCHECK(this->vkInterface(), CreateDebugReportCallbackEXT(fV kInstance, 106 GR_VK_CALL_ERRCHECK(this->vkInterface(), CreateDebugReportCallbackEXT(fV kInstance,
107 &callbackCreateInfo, nullptr, &fCallback)); 107 &callbackCreateInfo, nullptr, &fCallback));
108 } 108 }
109 #endif 109 #endif
110 110
111 fCompiler = shaderc_compiler_initialize(); 111 fCompiler = shaderc_compiler_initialize();
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 aglSwapBuffers(aglGetCurrentContext()); 1564 aglSwapBuffers(aglGetCurrentContext());
1565 int set_a_break_pt_here = 9; 1565 int set_a_break_pt_here = 9;
1566 aglSwapBuffers(aglGetCurrentContext()); 1566 aglSwapBuffers(aglGetCurrentContext());
1567 #elif defined(SK_BUILD_FOR_WIN32) 1567 #elif defined(SK_BUILD_FOR_WIN32)
1568 SwapBuf(); 1568 SwapBuf();
1569 int set_a_break_pt_here = 9; 1569 int set_a_break_pt_here = 9;
1570 SwapBuf(); 1570 SwapBuf();
1571 #endif 1571 #endif
1572 #endif 1572 #endif
1573 } 1573 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/vk/GrVkPipelineState.cpp » ('j') | src/gpu/vk/GrVkPipelineStateBuilder.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698