OSDN Git Service
(root)
/
android-x86
/
external-swiftshader.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e2b109
)
Fix Visual Studio warning treated as error.
author
Nicolas Capens
<capn@google.com>
Tue, 31 Oct 2017 19:36:55 +0000
(15:36 -0400)
committer
Nicolas Capens
<nicolascapens@google.com>
Tue, 31 Oct 2017 20:24:47 +0000
(20:24 +0000)
Was an implicit narrowing from size_t (64-bit) to unsigned int (32-bit).
Change-Id: I9726d70370d97da1bae2652bbce9db929179a292
Reviewed-on: https://swiftshader-review.googlesource.com/13469
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
src/OpenGL/libGLESv2/IndexDataManager.cpp
patch
|
blob
|
history
diff --git
a/src/OpenGL/libGLESv2/IndexDataManager.cpp
b/src/OpenGL/libGLESv2/IndexDataManager.cpp
index
57d7f4b
..
a32b7d1
100644
(file)
--- a/
src/OpenGL/libGLESv2/IndexDataManager.cpp
+++ b/
src/OpenGL/libGLESv2/IndexDataManager.cpp
@@
-261,7
+261,7
@@
int recomputePrimitiveCount(GLenum mode, GLsizei count, const std::vector<GLsize
}
return vertexPerPrimitive;
case GL_POINTS:
- *primitiveCount =
count - restartIndices.size(
);
+ *primitiveCount =
static_cast<unsigned int>(count - restartIndices.size()
);
return 1;
default:
UNREACHABLE(mode);