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

Commit dfbcee6c authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix build 

Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
parent 0589e582

libs/rs/driver/rsdGL.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -340,9 +340,9 @@ bool rsdGLInit(const Context *rsc) { 




    dc->gl.gl.OES_texture_npot = NULL != strstr((const char *)dc->gl.gl.extensions,

    dc->gl.gl.OES_texture_npot = NULL != strstr((const char *)dc->gl.gl.extensions,

                                                "GL_OES_texture_npot");

                                                "GL_OES_texture_npot");

    dc->gl.gl.GL_IMG_texture_npot = NULL != strstr((const char *)dc->gl.gl.extensions,

    dc->gl.gl.IMG_texture_npot = NULL != strstr((const char *)dc->gl.gl.extensions,

                                                   "GL_IMG_texture_npot");

                                                   "GL_IMG_texture_npot");

    dc->gl.gl.GL_NV_texture_npot_2D_mipmap = NULL != strstr((const char *)dc->gl.gl.extensions,

    dc->gl.gl.NV_texture_npot_2D_mipmap = NULL != strstr((const char *)dc->gl.gl.extensions,

                                                            "GL_NV_texture_npot_2D_mipmap");

                                                            "GL_NV_texture_npot_2D_mipmap");

    dc->gl.gl.EXT_texture_max_aniso = 1.0f;

    dc->gl.gl.EXT_texture_max_aniso = 1.0f;

    bool hasAniso = NULL != strstr((const char *)dc->gl.gl.extensions,

    bool hasAniso = NULL != strstr((const char *)dc->gl.gl.extensions,

libs/rs/driver/rsdGL.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -61,8 +61,8 @@ typedef struct RsdGLRec { 
        int32_t maxVertexTextureUnits;

        int32_t maxVertexTextureUnits;





        bool OES_texture_npot;

        bool OES_texture_npot;

        bool GL_IMG_texture_npot;

        bool IMG_texture_npot;

        bool GL_NV_texture_npot_2D_mipmap;

        bool NV_texture_npot_2D_mipmap;

        float EXT_texture_max_aniso;

        float EXT_texture_max_aniso;

    } gl;

    } gl;

libs/rs/driver/rsdShader.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -349,8 +349,8 @@ void RsdShader::setupSampler(const Context *rsc, const Sampler *s, const Allocat 




    if (!dc->gl.gl.OES_texture_npot && tex->getType()->getIsNp2()) {

    if (!dc->gl.gl.OES_texture_npot && tex->getType()->getIsNp2()) {

        if (tex->getHasGraphicsMipmaps() &&

        if (tex->getHasGraphicsMipmaps() &&

            (dc->gl.gl.GL_NV_texture_npot_2D_mipmap || dc->gl.gl.GL_IMG_texture_npot)) {

            (dc->gl.gl.NV_texture_npot_2D_mipmap || dc->gl.gl.IMG_texture_npot)) {

            if (dc->gl.gl.GL_NV_texture_npot_2D_mipmap) {

            if (dc->gl.gl.NV_texture_npot_2D_mipmap) {

                RSD_CALL_GL(glTexParameteri, target, GL_TEXTURE_MIN_FILTER,

                RSD_CALL_GL(glTexParameteri, target, GL_TEXTURE_MIN_FILTER,

                            trans[s->mHal.state.minFilter]);

                            trans[s->mHal.state.minFilter]);

            } else {

            } else {