瀏覽代碼

fix compile error and added runtime check

svifylabs 9 年之前
父節點
當前提交
e94d00517c
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      Source/Urho3D/Graphics/Direct3D11/D3D11Graphics.cpp
  2. 4 4
      Source/Urho3D/Graphics/OpenGL/OGLGraphics.cpp

+ 1 - 1
Source/Urho3D/Graphics/Direct3D11/D3D11Graphics.cpp

@@ -824,7 +824,7 @@ void Graphics::Draw(PrimitiveType type, unsigned indexStart, unsigned indexCount
     ++numBatches_;
 }
 
-void Graphics::Draw(PrimitiveType type, unsigned indexStart, unsigned indexCount, , unsigned baseVertexIndex, unsigned minVertex, unsigned vertexCount)
+void Graphics::Draw(PrimitiveType type, unsigned indexStart, unsigned indexCount, unsigned baseVertexIndex, unsigned minVertex, unsigned vertexCount)
 {
     if (!vertexCount || !shaderProgram_)
         return;

+ 4 - 4
Source/Urho3D/Graphics/OpenGL/OGLGraphics.cpp

@@ -832,7 +832,8 @@ void Graphics::Draw(PrimitiveType type, unsigned indexStart, unsigned indexCount
 void Graphics::Draw(PrimitiveType type, unsigned indexStart, unsigned indexCount, unsigned baseVertexIndex, unsigned minVertex, unsigned vertexCount)
 {
 #if !defined(GL_ES_VERSION_2_0)
-#if defined(GLEW_ARB_draw_elements_base_vertex)
+    if (!gl3Support)
+        return;
     if (!indexCount || !indexBuffer_ || !indexBuffer_->GetGPUObject())
         return;
 
@@ -849,7 +850,6 @@ void Graphics::Draw(PrimitiveType type, unsigned indexStart, unsigned indexCount
     numPrimitives_ += primitiveCount;
     ++numBatches_;
 #endif
-#endif
 }
 
 void Graphics::DrawInstanced(PrimitiveType type, unsigned indexStart, unsigned indexCount, unsigned minVertex, unsigned vertexCount,
@@ -892,7 +892,8 @@ void Graphics::DrawInstanced(PrimitiveType type, unsigned indexStart, unsigned i
         unsigned vertexCount, unsigned instanceCount)
 {
 #if !defined(GL_ES_VERSION_2_0)
-#if defined(GLEW_ARB_draw_elements_base_vertex)
+    if (!gl3Support)
+        return;
     if (!indexCount || !indexBuffer_ || !indexBuffer_->GetGPUObject() || !instancingSupport_)
         return;
 
@@ -911,7 +912,6 @@ void Graphics::DrawInstanced(PrimitiveType type, unsigned indexStart, unsigned i
     numPrimitives_ += instanceCount * primitiveCount;
     ++numBatches_;
 #endif
-#endif
 }
 void Graphics::SetVertexBuffer(VertexBuffer* buffer)
 {