Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor warning fixes

Browse Source
This commit is contained in:
Henrik Rydgard 2016-04-10 10:34:39 +02:00
parent 7cb6192005
commit fa64417917
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GPU/Vulkan/DrawEngineVulkan.cpp
View File

@ -626,7 +626,6 @@ void DrawEngineVulkan::DoFlush(VkCommandBuffer cmd) {
// We don't detect clears in this path, so here we can switch framebuffers if necessary. // We don't detect clears in this path, so here we can switch framebuffers if necessary.
int vertexCount = 0; int vertexCount = 0;
int maxIndex = 0;
bool useElements = true; bool useElements = true;
// Decode directly into the pushbuffer // Decode directly into the pushbuffer
@ -635,7 +634,6 @@ void DrawEngineVulkan::DoFlush(VkCommandBuffer cmd) {
gpuStats.numUncachedVertsDrawn += indexGen.VertexCount(); gpuStats.numUncachedVertsDrawn += indexGen.VertexCount();
useElements = !indexGen.SeenOnlyPurePrims(); useElements = !indexGen.SeenOnlyPurePrims();
vertexCount = indexGen.VertexCount(); vertexCount = indexGen.VertexCount();
maxIndex = indexGen.MaxIndex();
if (!useElements && indexGen.PureCount()) { if (!useElements && indexGen.PureCount()) {
vertexCount = indexGen.PureCount(); vertexCount = indexGen.PureCount();
} }

2
ext/native/thin3d/thin3d_gl.cpp
View File

@ -729,7 +729,7 @@ void Thin3DGLContext::SetTextures(int start, int count, Thin3DTexture **textures
glActiveTexture(GL_TEXTURE0 + i); glActiveTexture(GL_TEXTURE0 + i);
glTex->Bind(); glTex->Bind();
if (samplerStates_.size() > i && samplerStates_[i]) { if ((int)samplerStates_.size() > i && samplerStates_[i]) {
samplerStates_[i]->Apply(glTex->HasMips(), glTex->CanWrap()); samplerStates_[i]->Apply(glTex->HasMips(), glTex->CanWrap());
} }
} }

1
ext/native/thin3d/thin3d_vulkan.cpp
View File

@ -249,7 +249,6 @@ public:
void ToVulkan(VkPipelineVertexInputStateCreateInfo *info, VkVertexInputAttributeDescription *attrDescs, VkVertexInputBindingDescription *bindDescs) { void ToVulkan(VkPipelineVertexInputStateCreateInfo *info, VkVertexInputAttributeDescription *attrDescs, VkVertexInputBindingDescription *bindDescs) {
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
info->sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; info->sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
int offset = 0;
for (uint32_t i = 0; i < components_.size(); i++) { for (uint32_t i = 0; i < components_.size(); i++) {
attrDescs[i].binding = 0; attrDescs[i].binding = 0;
attrDescs[i].format = ConvertVertexDataTypeToVk(components_[i].type); attrDescs[i].format = ConvertVertexDataTypeToVk(components_[i].type);