Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1027)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/client/gles2_implementation_autogen.h

Issue 434063: Merged in recent changes to command buffer code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.cc ('k') | gpu/command_buffer/common/gles2_cmd_format.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/gles2_implementation_autogen.h
===================================================================
--- gpu/command_buffer/client/gles2_implementation_autogen.h (revision 33021)
+++ gpu/command_buffer/client/gles2_implementation_autogen.h (working copy)
@@ -252,77 +252,63 @@
void GetAttachedShaders(
GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-int GetAttribLocation(GLuint program, const char* name) {
- // TODO(gman): This needs to change to use SendString.
- GLint* result = shared_memory_.GetAddressAs<GLint*>(0);
- DCHECK(false); // pass in shared memory
- helper_->GetAttribLocationImmediate(program, name);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *result;
-}
+GLint GetAttribLocation(GLuint program, const char* name);
void GetBooleanv(GLenum pname, GLboolean* params) {
- helper_->GetBooleanv(pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetBooleanv(pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params) {
- helper_->GetBufferParameteriv(target, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetBufferParameteriv(
+ target, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
GLenum GetError() {
- helper_->GetError(shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLenum*>(0);
+ helper_->GetError(result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLenum>();
}
void GetFloatv(GLenum pname, GLfloat* params) {
- helper_->GetFloatv(pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetFloatv(pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetFramebufferAttachmentParameteriv(
GLenum target, GLenum attachment, GLenum pname, GLint* params) {
helper_->GetFramebufferAttachmentParameteriv(
- target, attachment, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ target, attachment, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetIntegerv(GLenum pname, GLint* params) {
- helper_->GetIntegerv(pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetIntegerv(pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetProgramiv(GLuint program, GLenum pname, GLint* params) {
- helper_->GetProgramiv(program, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetProgramiv(program, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
// TODO(gman): Implement this
@@ -331,21 +317,19 @@
void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params) {
helper_->GetRenderbufferParameteriv(
- target, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ target, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetShaderiv(GLuint shader, GLenum pname, GLint* params) {
- helper_->GetShaderiv(shader, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetShaderiv(shader, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
// TODO(gman): Implement this
@@ -362,53 +346,45 @@
const GLubyte* GetString(GLenum name);
void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) {
- helper_->GetTexParameterfv(target, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetTexParameterfv(
+ target, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetTexParameteriv(GLenum target, GLenum pname, GLint* params) {
- helper_->GetTexParameteriv(target, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetTexParameteriv(
+ target, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetUniformfv(GLuint program, GLint location, GLfloat* params);
void GetUniformiv(GLuint program, GLint location, GLint* params);
-int GetUniformLocation(GLuint program, const char* name) {
- // TODO(gman): This needs to change to use SendString.
- GLint* result = shared_memory_.GetAddressAs<GLint*>(0);
- DCHECK(false); // pass in shared memory
- helper_->GetUniformLocationImmediate(program, name);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *result;
-}
+GLint GetUniformLocation(GLuint program, const char* name);
void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) {
- helper_->GetVertexAttribfv(index, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetVertexAttribfv(
+ index, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params) {
- helper_->GetVertexAttribiv(index, pname, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
+ helper_->GetVertexAttribiv(
+ index, pname, result_shm_id(), result_shm_offset());
+ WaitForCmd();
GLsizei num_values = util_.GLGetNumValuesReturned(pname);
- memcpy(params, shared_memory_.GetAddress(0),
- num_values * sizeof(*params));
+ DCHECK_LE(num_values * sizeof(*params), kMaxSizeOfSimpleResult);
+ memcpy(params, result_buffer_, num_values * sizeof(*params));
}
void GetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer);
@@ -418,52 +394,45 @@
}
GLboolean IsBuffer(GLuint buffer) {
- helper_->IsBuffer(buffer, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLboolean*>(0);
+ helper_->IsBuffer(buffer, result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLboolean>();
}
GLboolean IsEnabled(GLenum cap) {
- helper_->IsEnabled(cap, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLboolean*>(0);
+ helper_->IsEnabled(cap, result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLboolean>();
}
GLboolean IsFramebuffer(GLuint framebuffer) {
- helper_->IsFramebuffer(framebuffer, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLboolean*>(0);
+ helper_->IsFramebuffer(framebuffer, result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLboolean>();
}
GLboolean IsProgram(GLuint program) {
- helper_->IsProgram(program, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLboolean*>(0);
+ helper_->IsProgram(program, result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLboolean>();
}
GLboolean IsRenderbuffer(GLuint renderbuffer) {
- helper_->IsRenderbuffer(renderbuffer, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLboolean*>(0);
+ helper_->IsRenderbuffer(renderbuffer, result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLboolean>();
}
GLboolean IsShader(GLuint shader) {
- helper_->IsShader(shader, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLboolean*>(0);
+ helper_->IsShader(shader, result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLboolean>();
}
GLboolean IsTexture(GLuint texture) {
- helper_->IsTexture(texture, shared_memory_.GetId(), 0);
- int32 token = helper_->InsertToken();
- helper_->WaitForToken(token);
- return *shared_memory_.GetAddressAs<GLboolean*>(0);
+ helper_->IsTexture(texture, result_shm_id(), result_shm_offset());
+ WaitForCmd();
+ return GetResultAs<GLboolean>();
}
void LineWidth(GLfloat width) {
@@ -474,9 +443,7 @@
helper_->LinkProgram(program);
}
-void PixelStorei(GLenum pname, GLint param) {
- helper_->PixelStorei(pname, param);
-}
+void PixelStorei(GLenum pname, GLint param);
void PolygonOffset(GLfloat factor, GLfloat units) {
helper_->PolygonOffset(factor, units);
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation.cc ('k') | gpu/command_buffer/common/gles2_cmd_format.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698