fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into vulkan

Browse Source
This commit is contained in:
Triang3l
2020-09-20 20:40:11 +03:00
parent 6a903192c3 fc55b1f81d
commit 7ba2126b2f
9 changed files with 274 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/xenia/ui/vulkan/vulkan_immediate_drawer.cc
View File

@@ -95,9 +95,6 @@ std::unique_ptr<ImmediateTexture> VulkanImmediateDrawer::CreateTexture(
return std::unique_ptr<ImmediateTexture>(texture.release());
}
void VulkanImmediateDrawer::UpdateTexture(ImmediateTexture* texture,
const uint8_t* data) {}
void VulkanImmediateDrawer::Begin(int render_target_width,
int render_target_height) {
assert_true(current_command_buffer_ == VK_NULL_HANDLE);

1
src/xenia/ui/vulkan/vulkan_immediate_drawer.h
View File

@@ -34,7 +34,6 @@ class VulkanImmediateDrawer : public ImmediateDrawer {
ImmediateTextureFilter filter,
bool repeat,
const uint8_t* data) override;
void UpdateTexture(ImmediateTexture* texture, const uint8_t* data) override;
void Begin(int render_target_width, int render_target_height) override;
void BeginDrawBatch(const ImmediateDrawBatch& batch) override;