Merge "Fix parsing of extension string" into mnc-dev (ea2afa46) · Commits · e / devices / smdk4412 / android_frameworks_native

opengl/libs/EGL/egl_object.cpp

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,9 @@
	** limitations under the License.		** limitations under the License.
	*/		*/

			#include <string>
			#include <sstream>

	#include <ctype.h>		#include <ctype.h>
	#include <stdint.h>		#include <stdint.h>
	#include <stdlib.h>		#include <stdlib.h>
	@@ -115,15 +118,11 @@ void egl_context_t::onMakeCurrent(EGLSurface draw, EGLSurface read) {
	}		}

	// tokenize the supported extensions for the glGetStringi() wrapper		// tokenize the supported extensions for the glGetStringi() wrapper
	exts = gl_extensions.string();		std::stringstream ss;
	while (1) {		std::string str;
	const char *end = strchr(exts, ' ');		ss << gl_extensions.string();
	if (end == NULL) {		while (ss >> str) {
	tokenized_gl_extensions.push(String8(exts));		tokenized_gl_extensions.push(String8(str.c_str()));
	break;
	}
	tokenized_gl_extensions.push(String8(exts, end - exts));
	exts = end + 1;
	}		}
	}		}
	}		}