mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:simulant/GLdc

Browse Source
This commit is contained in:
Hayden Kowalchuk 2019-02-28 10:30:57 -05:00
commit 4dadbcb20d
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GL/matrix.c
View File

@ -33,6 +33,10 @@ static const matrix_t IDENTITY = {
void APIENTRY glDepthRange(GLclampf n, GLclampf f); void APIENTRY glDepthRange(GLclampf n, GLclampf f);
matrix_t* _glGetProjectionMatrix() {
return (matrix_t*) stack_top(&MATRIX_STACKS[1]);
}
void initMatrices() { void initMatrices() {
init_stack(&MATRIX_STACKS[0], sizeof(matrix_t), 32); init_stack(&MATRIX_STACKS[0], sizeof(matrix_t), 32);
init_stack(&MATRIX_STACKS[1], sizeof(matrix_t), 32); init_stack(&MATRIX_STACKS[1], sizeof(matrix_t), 32);

2
GL/private.h
View File

@ -108,6 +108,8 @@ void _matrixLoadModelView();
void _matrixLoadTexture(); void _matrixLoadTexture();
void _applyRenderMatrix(); void _applyRenderMatrix();
matrix_t* _glGetProjectionMatrix();
void wipeTextureOnFramebuffers(GLuint texture); void wipeTextureOnFramebuffers(GLuint texture);
GLubyte checkImmediateModeInactive(const char* func); GLubyte checkImmediateModeInactive(const char* func);

12
GL/state.c
View File

@ -563,6 +563,18 @@ void APIENTRY glGetBooleanv(GLenum pname, GLboolean* params) {
} }
} }
void APIENTRY glGetFloatv(GLenum pname, GLfloat* params) {
switch(pname) {
case GL_PROJECTION_MATRIX:
memcpy(params, _glGetProjectionMatrix(), sizeof(float) * 16);
break;
default:
_glKosThrowError(GL_INVALID_ENUM, "glGetIntegerv");
_glKosPrintError();
break;
}
}
void APIENTRY glGetIntegerv(GLenum pname, GLint *params) { void APIENTRY glGetIntegerv(GLenum pname, GLint *params) {
switch(pname) { switch(pname) {
case GL_MAX_LIGHTS: case GL_MAX_LIGHTS:

4
containers/named_array.c
View File

@ -60,8 +60,8 @@ void* named_array_alloc(NamedArray* array, unsigned int* new_id) {
void* named_array_reserve(NamedArray* array, unsigned int id) { void* named_array_reserve(NamedArray* array, unsigned int id) {
if(!named_array_used(array, id)) { if(!named_array_used(array, id)) {
unsigned int j = id % 8; unsigned int j = (id % 8) - 1;
unsigned int i = (id - j) / 8; unsigned int i = id / 8;
assert(!named_array_used(array, id)); assert(!named_array_used(array, id));
array->used_markers[i] |= (unsigned char) 1 << j; array->used_markers[i] |= (unsigned char) 1 << j;