Emulate GL_PRIMITIVE_RESTART_FIXED_INDEX: part I

gpu/command_buffer/service/context_state.cc

Index: gpu/command_buffer/service/context_state.cc
diff --git a/gpu/command_buffer/service/context_state.cc b/gpu/command_buffer/service/context_state.cc
index 05ea8af6950f8977fcf9ca331c4b682d2aad71b4..5c5da8275053b1abfc106abf9dea885472572854 100644
--- a/gpu/command_buffer/service/context_state.cc
+++ b/gpu/command_buffer/service/context_state.cc
@@ -285,16 +285,8 @@ ErrorState* ContextState::GetErrorState() {
 
 void ContextState::EnableDisable(GLenum pname, bool enable) const {
   if (pname == GL_PRIMITIVE_RESTART_FIXED_INDEX) {

[piman, 2015/04/27 23:05:27]

nit: can you add a TODO linking to the bug?
I understand we're trying to silence the warning, but this is the wrong
behavior, it should be made obvious here.

[Zhenyao Mo, 2015/04/27 23:11:22]

So here the behavior is correct.  Nothing to be done further.  But we need to do
more in other places to make this work, i.e., in each draw call, set the index
according to the type using glPrimitiveRestartIndex. I'll add to do to both
DrawArray and DrawElements.

-    // This is only available on Desktop GL 4.3+, but we emulate ES 3.0 on top
-    // of Desktop GL 4.2+.
-    const gfx::GLVersionInfo& gl_version = feature_info_->gl_version_info();
-    if (!gl_version.is_es &&
-        (gl_version.major_version < 4 ||
-         (gl_version.major_version == 4 && gl_version.minor_version < 3))) {
-      // TODO(zmo): Ignoring it may not be the best emulation.
-      NOTIMPLEMENTED();
-      return;
-    }
+    if (feature_info_->feature_flags().emulate_primitive_restart_fixed_index)
+      pname = GL_PRIMITIVE_RESTART;
   }
   if (enable) {
     glEnable(pname);