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-27 16:43:33 +03:00
parent 9f8c45c4e6 c2e8c5554d
commit 377a8d790d
8 changed files with 136 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,7 +364,7 @@ void VulkanImmediateDrawer::Draw(const ImmediateDraw& draw) {
// Bind the texture.
uint32_t texture_descriptor_index;
VulkanImmediateTexture* texture =
reinterpret_cast<VulkanImmediateTexture*>(draw.texture_handle);
static_cast<VulkanImmediateTexture*>(draw.texture);
if (texture && texture->immediate_drawer_ == this) {
texture_descriptor_index = texture->resource_.descriptor_index;
texture->last_usage_submission_ = context_.swap_submission_current();

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

@@ -36,7 +36,7 @@ class VulkanImmediateDrawer : public ImmediateDrawer {
std::unique_ptr<ImmediateTexture> CreateTexture(uint32_t width,
uint32_t height,
ImmediateTextureFilter filter,
bool repeat,
bool is_repeated,
const uint8_t* data) override;
void Begin(int render_target_width, int render_target_height) override;
@@ -62,9 +62,7 @@ class VulkanImmediateDrawer : public ImmediateDrawer {
};
VulkanImmediateTexture(uint32_t width, uint32_t height)
: ImmediateTexture(width, height), immediate_drawer_(nullptr) {
handle = reinterpret_cast<uintptr_t>(this);
}
: ImmediateTexture(width, height), immediate_drawer_(nullptr) {}
~VulkanImmediateTexture() override;
// If null, this is either a blank texture, or the immediate drawer has been