zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- backend update.

Browse source 
# Conflicts:
#	source/common/textures/animtexture.cpp

# Conflicts:
#	source/common/2d/v_2ddrawer.cpp
#	source/common/textures/multipatchtexturebuilder.cpp
This commit is contained in:
Christoph Oelckers 2020-05-03 09:31:37 +02:00
parent 611dad7f69
commit 9ec66bafa1
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/common/rendering/vulkan/renderer/vk_postprocess.cpp
View file

@ -533,10 +533,10 @@ void VkPPRenderState::RenderScreenQuad(VkPPRenderPassSetup *passSetup, VulkanDes
auto cmdbuffer = fb->GetDrawCommands(); auto cmdbuffer = fb->GetDrawCommands();
VkViewport viewport = { }; VkViewport viewport = { };
viewport.x = x; viewport.x = (float)x;
viewport.y = y; viewport.y = (float)y;
viewport.width = width; viewport.width = (float)width;
viewport.height = height; viewport.height = (float)height;
viewport.minDepth = 0.0f; viewport.minDepth = 0.0f;
viewport.maxDepth = 1.0f; viewport.maxDepth = 1.0f;
@ -761,7 +761,7 @@ void VkPPRenderPassSetup::CreatePipeline(const VkPPRenderPassKey &key)
builder.addDynamicState(VK_DYNAMIC_STATE_SCISSOR); builder.addDynamicState(VK_DYNAMIC_STATE_SCISSOR);
// Note: the actual values are ignored since we use dynamic viewport+scissor states // Note: the actual values are ignored since we use dynamic viewport+scissor states
builder.setViewport(0.0f, 0.0f, 320.0f, 200.0f); builder.setViewport(0.0f, 0.0f, 320.0f, 200.0f);
builder.setScissor(0.0f, 0.0f, 320.0f, 200.0f); builder.setScissor(0, 0, 320, 200);
if (key.StencilTest) if (key.StencilTest)
{ {
builder.addDynamicState(VK_DYNAMIC_STATE_STENCIL_REFERENCE); builder.addDynamicState(VK_DYNAMIC_STATE_STENCIL_REFERENCE);

2
source/common/rendering/vulkan/renderer/vk_renderpass.cpp
View file

@ -404,7 +404,7 @@ std::unique_ptr<VulkanPipeline> VkRenderPassSetup::CreatePipeline(const VkPipeli
// Note: the actual values are ignored since we use dynamic viewport+scissor states // Note: the actual values are ignored since we use dynamic viewport+scissor states
builder.setViewport(0.0f, 0.0f, 320.0f, 200.0f); builder.setViewport(0.0f, 0.0f, 320.0f, 200.0f);
builder.setScissor(0, 0, 320.0f, 200.0f); builder.setScissor(0, 0, 320, 200);
static const VkPrimitiveTopology vktopology[] = { static const VkPrimitiveTopology vktopology[] = {
VK_PRIMITIVE_TOPOLOGY_POINT_LIST, VK_PRIMITIVE_TOPOLOGY_POINT_LIST,

2
source/common/textures/animtexture.cpp
View file

@ -71,7 +71,7 @@ FBitmap AnimTexture::GetBgraBitmap(const PalEntry* remap, int* trans)
{ {
int p = i * 4; int p = i * 4;
int index = spix[i]; int index = spix[i];
dpix[p + 0] = Palette[index * 3 + 2]; dpix[p + 0] = Palette[index*3+2];
dpix[p + 1] = Palette[index * 3 + 1]; dpix[p + 1] = Palette[index * 3 + 1];
dpix[p + 2] = Palette[index * 3]; dpix[p + 2] = Palette[index * 3];
dpix[p + 3] = 255; dpix[p + 3] = 255;