Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 5035 into donut

Browse Source 
* changes:
  add glTexParameteri() and fix glTexParameteriv()
This commit is contained in:
Android (Google) Code Review
2009-06-22 18:18:39 -07:00
parent 11348cffef aaf4b6b331
commit 5277103db9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/private/opengles/gl_context.h
View File

@@ -456,7 +456,7 @@ struct matrix_stack_t {
void validate(); void validate();
matrixf_t& top() { return stack[depth]; } matrixf_t& top() { return stack[depth]; }
const matrixf_t& top() const { return stack[depth]; } const matrixf_t& top() const { return stack[depth]; }
const uint32_t top_ops() const { return ops[depth]; } uint32_t top_ops() const { return ops[depth]; }
inline bool isRigidBody() const { inline bool isRigidBody() const {
return !(ops[depth] & ~(OP_TRANSLATE|OP_UNIFORM_SCALE|OP_ROTATE)); return !(ops[depth] & ~(OP_TRANSLATE|OP_UNIFORM_SCALE|OP_ROTATE));
} }

9
opengl/libagl/texture.cpp
View File

@@ -900,7 +900,7 @@ void glTexParameteriv(
memcpy(textureObject->crop_rect, params, 4*sizeof(GLint)); memcpy(textureObject->crop_rect, params, 4*sizeof(GLint));
break; break;
default: default:
ogles_error(c, GL_INVALID_ENUM); texParameterx(target, pname, GLfixed(params[0]), c);
return; return;
} }
} }
@@ -919,6 +919,13 @@ void glTexParameterx(
texParameterx(target, pname, param, c); texParameterx(target, pname, param, c);
} }
void glTexParameteri(
GLenum target, GLenum pname, GLint param)
{
ogles_context_t* c = ogles_context_t::get();
texParameterx(target, pname, GLfixed(param), c);
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if 0 #if 0
#pragma mark - #pragma mark -