summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:25:11 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:25:11 +0200
commit4706e8bed616e0ef816a7fb579333f892508c64b (patch)
tree7b398bd574cb86c896c098e94962e9d4fb5a5508
parent4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 (diff)
downloadUXP-4706e8bed616e0ef816a7fb579333f892508c64b.tar
UXP-4706e8bed616e0ef816a7fb579333f892508c64b.tar.gz
UXP-4706e8bed616e0ef816a7fb579333f892508c64b.tar.lz
UXP-4706e8bed616e0ef816a7fb579333f892508c64b.tar.xz
UXP-4706e8bed616e0ef816a7fb579333f892508c64b.zip
Re-apply genericDraw* fixes
-rwxr-xr-xgfx/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp6
-rwxr-xr-xgfx/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp b/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
index 4ebac6016..304bbe8cb 100755
--- a/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
+++ b/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
@@ -148,7 +148,7 @@ gl::Error Context11::finish()
gl::Error Context11::drawArrays(GLenum mode, GLint first, GLsizei count)
{
- return mRenderer->genericDrawArrays(this, mode, first, count, 0);
+ return mRenderer->genericDrawArrays(this, mode, first, count, 1);
}
gl::Error Context11::drawArraysInstanced(GLenum mode,
@@ -165,7 +165,7 @@ gl::Error Context11::drawElements(GLenum mode,
const GLvoid *indices,
const gl::IndexRange &indexRange)
{
- return mRenderer->genericDrawElements(this, mode, count, type, indices, 0, indexRange);
+ return mRenderer->genericDrawElements(this, mode, count, type, indices, 1, indexRange);
}
gl::Error Context11::drawElementsInstanced(GLenum mode,
@@ -186,7 +186,7 @@ gl::Error Context11::drawRangeElements(GLenum mode,
const GLvoid *indices,
const gl::IndexRange &indexRange)
{
- return mRenderer->genericDrawElements(this, mode, count, type, indices, 0, indexRange);
+ return mRenderer->genericDrawElements(this, mode, count, type, indices, 1, indexRange);
}
GLenum Context11::getResetStatus()
diff --git a/gfx/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp b/gfx/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
index 1c90fffa1..9b31ab927 100755
--- a/gfx/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
+++ b/gfx/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
@@ -137,7 +137,7 @@ gl::Error Context9::finish()
gl::Error Context9::drawArrays(GLenum mode, GLint first, GLsizei count)
{
- return mRenderer->genericDrawArrays(this, mode, first, count, 0);
+ return mRenderer->genericDrawArrays(this, mode, first, count, 1);
}
gl::Error Context9::drawArraysInstanced(GLenum mode,
@@ -154,7 +154,7 @@ gl::Error Context9::drawElements(GLenum mode,
const GLvoid *indices,
const gl::IndexRange &indexRange)
{
- return mRenderer->genericDrawElements(this, mode, count, type, indices, 0, indexRange);
+ return mRenderer->genericDrawElements(this, mode, count, type, indices, 1, indexRange);
}
gl::Error Context9::drawElementsInstanced(GLenum mode,
@@ -175,7 +175,7 @@ gl::Error Context9::drawRangeElements(GLenum mode,
const GLvoid *indices,
const gl::IndexRange &indexRange)
{
- return mRenderer->genericDrawElements(this, mode, count, type, indices, 0, indexRange);
+ return mRenderer->genericDrawElements(this, mode, count, type, indices, 1, indexRange);
}
GLenum Context9::getResetStatus()