Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 952663ef authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 5277103d: Merge change 5035 into donut 

Merge commit '5277103db9033226814edc8fcba6f4ba4e846678'

* commit '5277103db9033226814edc8fcba6f4ba4e846678':
  add glTexParameteri() and fix glTexParameteriv()
parents 8e3b0f15 6bca3dae

include/private/opengles/gl_context.h

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ struct matrix_stack_t { 
    void validate();

    matrixf_t& top() { 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 {

        return !(ops[depth] & ~(OP_TRANSLATE|OP_UNIFORM_SCALE|OP_ROTATE));

    }

opengl/libagl/texture.cpp

+8 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ void glTexParameteriv( 
        memcpy(textureObject->crop_rect, params, 4*sizeof(GLint));

        break;

    default:

        ogles_error(c, GL_INVALID_ENUM);

        texParameterx(target, pname, GLfixed(params[0]), c);

        return;

    }

}
@@ -919,6 +919,13 @@ void glTexParameterx( 
    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

#pragma mark -