VirtualBox

Ignore:
Timestamp:
Aug 9, 2016 11:40:19 AM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
109822
Message:

GuestHost/OpenGL: warnings (gcc).

Location:
trunk/src/VBox/GuestHost/OpenGL/state_tracker
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c

    r48491 r63199  
    974974                             CRContext *fromCtx, CRContext *toCtx)
    975975{
    976     CRBufferObjectState *from = &(fromCtx->bufferobject);
    977     const CRBufferObjectState *to = &(toCtx->bufferobject);
     976    /*CRBufferObjectState *from = &(fromCtx->bufferobject); - unused
     977    const CRBufferObjectState *to = &(toCtx->bufferobject); - unused */
    978978
    979979    if (!HaveBufferObjectExtension())
    … …  
    987987    CRBufferObject *pBufferObj = (CRBufferObject *) data1;
    988988    CRBufferObjectState *pState = (CRBufferObjectState *) data2;
     989    (void)key;
    989990
    990991    if (pBufferObj->id && !pBufferObj->hwid)
    … …  
    10201021                               CRContext *fromCtx, CRContext *toCtx)
    10211022{
    1022     const CRBufferObjectState *from = &(fromCtx->bufferobject);
     1023    /*const CRBufferObjectState *from = &(fromCtx->bufferobject); - unused */
    10231024    CRBufferObjectState *to = &(toCtx->bufferobject);
    10241025    int i;

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c

    r51319 r63199  
    15351535  /* XXX todo */
    15361536    crWarning("crStateVertexArrayRangeNV not implemented");
     1537    (void)length; (void)pointer;
    15371538}
    15381539
    … …  
    15471548#define CRSTATE_IS_SERVER_CP(cp) (!(cp).enabled || !(cp).p || ((cp).buffer && (cp).buffer->id) || ((cp).locked))
    15481549
     1550#if defined(DEBUG) && 0
    15491551static void crStateDumpClientPointer(CRClientPointer *cp, const char *name, int i)
    15501552{
    … …  
    15521554  {
    15531555    crDebug("CP(%s): enabled:%d ptr:%p buffer:%p buffer.name:%i locked: %i %s",
    1554             name, cp->enabled, cp->p, cp->buffer, cp->buffer? cp->buffer->id:-1, (int)cp->locked,
     1556            name, cp->enabled, cp->p, cp->buffer, cp->buffer ? cp->buffer->id : ~(GLuint)0, (int)cp->locked,
    15551557            CRSTATE_IS_SERVER_CP(*cp) ? "":"!FAIL!");
    15561558  }
    … …  
    15581560  {
    15591561    crDebug("CP(%s%i): enabled:%d ptr:%p buffer:%p buffer.name:%i locked: %i %s",
    1560             name, i, cp->enabled, cp->p, cp->buffer, cp->buffer? cp->buffer->id:-1, (int)cp->locked,
     1562            name, i, cp->enabled, cp->p, cp->buffer, cp->buffer ? cp->buffer->id : ~(GLuint)0, (int)cp->locked,
    15611563            CRSTATE_IS_SERVER_CP(*cp) ? "":"!FAIL!");
    15621564  }
    15631565}
     1566#endif
    15641567
    15651568#ifdef DEBUG_misha
    15661569/* debugging */
    1567 //# define CR_NO_SERVER_ARRAYS
     1570/*# define CR_NO_SERVER_ARRAYS*/
    15681571#endif
    15691572

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_current.c

    r51313 r63199  
    366366             (toCtx->extensions.NV_vertex_program))) {
    367367        const unsigned attribsUsedMask = toCtx->current.attribsUsedMask;
    368         int i;
    369368        for (i = 1; i < CR_MAX_VERTEX_ATTRIBS; i++) {  /* skip zero */
    370369            if ((attribsUsedMask & (1 << i))

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_enable.c

    r44326 r63199  
    389389                case GL_MAP1_VERTEX_ATTRIB15_4_NV:
    390390                        {
    391                                 const GLint i = cap - GL_MAP1_VERTEX_ATTRIB0_4_NV;
    392                                 g->eval.enableAttrib1D[i] = val;
    393                                 DIRTY(sb->program.map1AttribArrayEnable[i], neg_bitid);
     391                                const GLint idx = cap - GL_MAP1_VERTEX_ATTRIB0_4_NV;
     392                                g->eval.enableAttrib1D[idx] = val;
     393                                DIRTY(sb->program.map1AttribArrayEnable[idx], neg_bitid);
    394394                                DIRTY(sb->program.dirty, neg_bitid);
    395395                        }
    … …  
    412412                case GL_MAP2_VERTEX_ATTRIB15_4_NV:
    413413                        {
    414                                 const GLint i = cap - GL_MAP2_VERTEX_ATTRIB0_4_NV;
    415                                 g->eval.enableAttrib2D[i] = val;
    416                                 DIRTY(sb->program.map2AttribArrayEnable[i], neg_bitid);
     414                                const GLint idx = cap - GL_MAP2_VERTEX_ATTRIB0_4_NV;
     415                                g->eval.enableAttrib2D[idx] = val;
     416                                DIRTY(sb->program.map2AttribArrayEnable[idx], neg_bitid);
    417417                                DIRTY(sb->program.dirty, neg_bitid);
    418418                        }

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_fence.c

    r15532 r63199  
    1313void APIENTRY crStateGenFencesNV(GLsizei n, GLuint *fences)
    1414{
     15    (void)n; (void)fences;
    1516}
    1617
    … …  
    1819void APIENTRY crStateDeleteFencesNV(GLsizei n, const GLuint *fences)
    1920{
     21    (void)n; (void)fences;
    2022}
    2123
    2224void APIENTRY crStateSetFenceNV(GLuint fence, GLenum condition)
    2325{
     26    (void)fence; (void)condition;
    2427}
    2528
    2629GLboolean APIENTRY crStateTestFenceNV(GLuint fence)
    2730{
    28    return GL_FALSE;
     31    (void)fence;
     32    return GL_FALSE;
    2933}
    3034
    3135void APIENTRY crStateFinishFenceNV(GLuint fence)
    3236{
     37    (void)fence;
    3338}
    3439
    3540GLboolean APIENTRY crStateIsFenceNV(GLuint fence)
    3641{
    37    return GL_FALSE;
     42    (void)fence;
     43    return GL_FALSE;
    3844}
    3945
    4046void APIENTRY crStateGetFenceivNV(GLuint fence, GLenum pname, GLint *params)
    4147{
     48    (void)fence; (void)pname; (void)params;
    4249}
    4350

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c

    r62814 r63199  
    228228{
    229229    CRContext *g = GetCurrentContext();
    230     CRFramebufferObjectState *fbo = &g->framebufferobject;
     230    /*CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
    231231    int i;
    232232
    … …  
    481481/*@todo: move this function somewhere else*/
    482482/*return floor of base 2 log of x. log(0)==0*/
    483 unsigned int crLog2Floor(unsigned int x)
     483static unsigned int crLog2Floor(unsigned int x)
    484484{
    485485    x |= (x >> 1);
    … …  
    614614{
    615615    CRContext *g = GetCurrentContext();
    616     CRFramebufferObjectState *fbo = &g->framebufferobject;
     616    /*CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
    617617    CRFBOAttachmentPoint *aap[2];
    618618    GLuint cap, i;
    … …  
    648648{
    649649    CRContext *g = GetCurrentContext();
    650     CRFramebufferObjectState *fbo = &g->framebufferobject;
     650    /* CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
    651651    CRFBOAttachmentPoint *aap[2];
    652652    GLuint cap, i;
    … …  
    686686{
    687687    CRContext *g = GetCurrentContext();
    688     CRFramebufferObjectState *fbo = &g->framebufferobject;
     688    /* CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
    689689    CRFBOAttachmentPoint *aap[2];
    690690    GLuint cap, i;
    … …  
    727727    CRFBOAttachmentPoint *aap[2];
    728728    CRRenderbufferObject *rb;
     729    (void)renderbuffertarget;
    729730
    730731    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
    … …  
    872873crStateGenerateMipmapEXT(GLenum target)
    873874{
     875    (void)target;
    874876    /*@todo*/
    875877}
    … …  
    878880{
    879881    CRRenderbufferObject *pRBO = (CRRenderbufferObject*) data1;
     882    (void)key; (void)data2;
    880883
    881884    diff_api.GenRenderbuffersEXT(1, &pRBO->hwid);
    … …  
    943946    CRContext *ctx = (CRContext*) data2;
    944947    GLint i;
     948    (void)key;
    945949
    946950    diff_api.GenFramebuffersEXT(1, &pFBO->hwid);
    … …  
    10891093    CRContext *g = GetCurrentContext();
    10901094    CRFramebufferObject *pFBO = (CRFramebufferObject*) crHashtableSearch(g->shared->fbTable, id);
    1091 #if 0 //def DEBUG_misha
     1095#if 0 /*def DEBUG_misha*/
    10921096    crDebug("FB id(%d) hw(%d)", id, pFBO ? pFBO->hwid : 0);
    10931097#endif

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c

    r62492 r63199  
    136136    CRContext *ctx = (CRContext*) data2;
    137137    CRGLSLShader *pRealShader;
    138     (void) key;
     138    (void) key; (void)ctx;
    139139
    140140    pRealShader = crStateGetShaderObj(pShader->id);
    … …  
    406406static void crStateDbgCheckNoProgramOfId(void *data)
    407407{
     408    (void)data;
    408409    crError("Unexpected Program id");
    409410}
    … …  
    849850    }
    850851
    851     if (cbData<sizeof(GLsizei))
     852    if (cbData<(GLsizei)sizeof(GLsizei))
    852853    {
    853854        crWarning("crStateGLSLProgramCacheUniforms: data too short");
    … …  
    859860    cbRead = sizeof(GLsizei);
    860861
    861     //crDebug("crStateGLSLProgramCacheUniforms: %i active uniforms", pProgram->cUniforms);
     862    /*crDebug("crStateGLSLProgramCacheUniforms: %i active uniforms", pProgram->cUniforms);*/
    862863
    863864    if (pProgram->cUniforms)
    … …  
    896897        pCurrent += cbName;
    897898
    898         //crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%d, %s", i, pProgram->pUniforms[i].location, pProgram->pUniforms[i].name);
     899        /*crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%d, %s", i, pProgram->pUniforms[i].location, pProgram->pUniforms[i].name);*/
    899900    }
    900901
    … …  
    925926    }
    926927
    927     if (cbData<sizeof(GLsizei))
     928    if (cbData<(GLsizei)sizeof(GLsizei))
    928929    {
    929930        WARN(("crStateGLSLProgramCacheAttribs: data too short"));
    … …  
    991992    }
    992993
    993     //crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%s.", location, pName);
     994    /*crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%s.", location, pName);*/
    994995
    995996    ((GLint*)*pCurrent)[0] = location;
    … …  
    13221323    CRGLSLShader *pShader = (CRGLSLShader*) data1;
    13231324    CRContext *ctx = (CRContext *) data2;
     1325    (void)ctx; (void)key;
    13241326
    13251327    pShader->hwid = diff_api.CreateShader(pShader->type);
    … …  
    13871389    CRContext *ctx = (CRContext *) data2;
    13881390    GLuint i;
     1391    (void)key;
    13891392
    13901393    pProgram->hwid = diff_api.CreateProgram();

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c

    r57423 r63199  
    7676}
    7777
    78 void crStateReleaseTextureInternal(CRSharedState *pS, CRContext *pCtx, CRTextureObj *pObj)
     78static void crStateReleaseTextureInternal(CRSharedState *pS, CRContext *pCtx, CRTextureObj *pObj)
    7979{
    8080    Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj) || pObj->pinned);
    … …  
    102102}
    103103
    104 void crStateReleaseBufferObjectInternal(CRSharedState *pS, CRContext *pCtx, CRBufferObject *pObj)
     104static void crStateReleaseBufferObjectInternal(CRSharedState *pS, CRContext *pCtx, CRBufferObject *pObj)
    105105{
    106106    Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj));
    … …  
    110110}
    111111
    112 void crStateReleaseFBOInternal(CRSharedState *pS, CRContext *pCtx, CRFramebufferObject *pObj)
     112static void crStateReleaseFBOInternal(CRSharedState *pS, CRContext *pCtx, CRFramebufferObject *pObj)
    113113{
    114114    Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj));
    … …  
    118118}
    119119
    120 void crStateReleaseRBOInternal(CRSharedState *pS, CRContext *pCtx, CRRenderbufferObject *pObj)
     120static void crStateReleaseRBOInternal(CRSharedState *pS, CRContext *pCtx, CRRenderbufferObject *pObj)
    121121{
    122122    Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj));
    … …  
    130130    PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
    131131    CRTextureObj *pObj = (CRTextureObj *)data1;
     132    (void)key;
    132133    crStateReleaseTextureInternal(pData->s, pData->pCtx, pObj);
    133134}
    … …  
    137138    PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
    138139    CRBufferObject *pObj = (CRBufferObject *)data1;
     140    (void)key;
    139141    crStateReleaseBufferObjectInternal(pData->s, pData->pCtx, pObj);
    140142}
    … …  
    144146    PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
    145147    CRFramebufferObject *pObj = (CRFramebufferObject *)data1;
     148    (void)key;
    146149    crStateReleaseFBOInternal(pData->s, pData->pCtx, pObj);
    147150}
    … …  
    151154    PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
    152155    CRRenderbufferObject *pObj = (CRRenderbufferObject *)data1;
     156    (void)key;
    153157    crStateReleaseRBOInternal(pData->s, pData->pCtx, pObj);
    154158}
     159
    155160
    156161/**
    157162 * Decrement shared state's refcount and delete when it hits zero.
    158163 */
    159 DECLEXPORT(void)
    160 crStateFreeShared(CRContext *pContext, CRSharedState *s)
     164#ifndef IN_GUEST
     165DECLEXPORT(void) crStateFreeShared(CRContext *pContext, CRSharedState *s)
     166#else
     167static void crStateFreeShared(CRContext *pContext, CRSharedState *s)
     168#endif
    161169{
    162170    int32_t refCount = ASMAtomicDecS32(&s->refCount);
    … …  
    188196}
    189197
    190 DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire()
     198#ifndef IN_GUEST
     199
     200DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire(void)
    191201{
    192202    if (!gSharedState)
    … …  
    199209}
    200210
    201 DECLEXPORT(void) crStateGlobalSharedRelease()
     211DECLEXPORT(void) crStateGlobalSharedRelease(void)
    202212{
    203213    crStateFreeShared(NULL, gSharedState);
    204214}
     215
     216#endif /* IN_GUEST */
    205217
    206218DECLEXPORT(void) STATE_APIENTRY
    … …  
    298310 */
    299311static CRContext *
    300 crStateCreateContextId(int i, const CRLimitsState *limits,
    301                                              GLint visBits, CRContext *shareCtx)
     312crStateCreateContextId(int i, const CRLimitsState *limits, GLint visBits, CRContext *shareCtx)
    302313{
    303314    CRContext *ctx;
    … …  
    305316    int node32 = i >> 5;
    306317    int node = i & 0x1f;
     318    (void)limits;
    307319
    308320    if (g_pAvailableContexts[i] != NULL)
    … …  
    800812{
    801813    /* This no-op function helps smooth code-gen */
     814    (void)target; (void)value;
    802815}
    803816
    … …  
    806819{
    807820    /* This no-op function helps smooth code-gen */
     821    (void)target; (void)value;
    808822}
    809823
    … …  
    812826{
    813827    /* This no-op function helps smooth code-gen */
     828    (void)target; (void)type; (void)count; (void)values;
    814829}
    815830
    … …  
    818833{
    819834    /* This no-op function helps smooth code-gen */
     835    (void)target; (void)index; (void)type; (void)count; (void)values;
    820836}
    821837
    … …  
    825841{
    826842    /* This no-op function helps smooth code-gen */
    827 }
    828 
    829 void crStateVBoxDetachThread()
     843    (void)x; (void)y; (void)width; (void)height; (void)format; (void)type; (void)pixels;
     844}
     845
     846void crStateVBoxDetachThread(void)
    830847{
    831848    /* release the context ref so that it can be freed */
    … …  
    834851
    835852
    836 void crStateVBoxAttachThread()
    837 {
    838 }
     853void crStateVBoxAttachThread(void)
     854{
     855}
     856
     857#if 0 /* who's refering to these? */
    839858
    840859GLint crStateVBoxCreateContext( GLint con, const char * dpyName, GLint visual, GLint shareCtx )
    841860{
     861    (void)con; (void)dpyName; (void)visual; (void)shareCtx;
    842862    return 0;
    843863}
    … …  
    845865GLint crStateVBoxWindowCreate( GLint con, const char *dpyName, GLint visBits  )
    846866{
     867    (void)con; (void)dpyName; (void)visBits;
    847868    return 0;
    848869}
    … …  
    850871void crStateVBoxWindowDestroy( GLint con, GLint window )
    851872{
     873    (void)con; (void)window;
    852874}
    853875
    854876GLint crStateVBoxConCreate(struct VBOXUHGSMI *pHgsmi)
    855877{
     878    (void)pHgsmi;
    856879    return 0;
    857880}
    … …  
    859882void crStateVBoxConDestroy(GLint con)
    860883{
     884    (void)con;
    861885}
    862886
    863887void crStateVBoxConFlush(GLint con)
    864888{
    865 }
     889    (void)con;
     890}
     891
     892#endif /* unused? */

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_lists.c

    r52263 r63199  
    1414{
    1515    /* nothing - dlists are in shared state */
     16    (void)ctx;
    1617}
    1718
    … …  
    3132}
    3233
    33 //#define CRSTATE_DEBUG_QUERY_HW_STATE
     34/*#define CRSTATE_DEBUG_QUERY_HW_STATE*/
    3435
    3536#ifndef CRSTATE_DEBUG_QUERY_HW_STATE
    … …  
    173174    CRContext *g = GetCurrentContext();
    174175    CRStateBits *sb = GetCurrentBits();
    175     CRbitvalue *bitID=g->bitid, *negbitID=g->neg_bitid;
     176    CRbitvalue /* *bitID=g->bitid, */ *negbitID=g->neg_bitid;
    176177
    177178    CRASSERT(g_bVBoxEnableDiffOnMakeCurrent);
    … …  
    819820    {
    820821        int i;
    821         const int gleval_sizes[] = {4, 1, 3, 1, 2, 3, 4, 3, 4};
     822        const int gleval_sizes_dup[] = {4, 1, 3, 1, 2, 3, 4, 3, 4};
    822823
    823824        if (CHECKDIRTY(sb->eval.enable, negbitID))
    … …  
    850851                if (order>0)
    851852                {
    852                     coeffs = crAlloc(order * gleval_sizes[i] * sizeof(GLfloat));
     853                    coeffs = crAlloc(order * gleval_sizes_dup[i] * sizeof(GLfloat));
    853854                    if (!coeffs)
    854855                    {
    … …  
    889890                if (order[0]>0 && order[1]>0)
    890891                {
    891                     coeffs = crAlloc(order[0] * order[1] * gleval_sizes[i] * sizeof(GLfloat));
     892                    coeffs = crAlloc(order[0] * order[1] * gleval_sizes_dup[i] * sizeof(GLfloat));
    892893                    if (!coeffs)
    893894                    {

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_occlude.c

    r15532 r63199  
    138138        CRContext *g = GetCurrentContext();
    139139        CROcclusionState *o = &(g->occlusion);
     140        (void)target;
    140141
    141142        FLUSH();
    … …  
    323324{
    324325        /* Apparently, no occlusion state differencing needed */
     326        (void)bb; (void)bitID; (void)fromCtx; (void)toCtx;
    325327}
    326328
    … …  
    336338         * glEndQuery sequence.
    337339         */
     340        (void)bb; (void)bitID; (void)fromCtx; (void)toCtx;
    338341        CRASSERT(!fromCtx->occlusion.currentQueryObject);
    339342}

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_polygon.txt

    r15532 r63199  
    1515:mode:frontMode:PolygonMode,GL_FRONT
    1616-:stipple:stipple:*diff_api.PolygonStipple ((GLubyte *) to->stipple);
    17 +:stipple:*int j;
     17+:stipple:*int iStripple;
    1818+:stipple:*diff_api.PolygonStipple ((GLubyte *) to->stipple);
    19 +:stipple:*for (j=0; j<32; j++)
     19+:stipple:*for (iStripple=0; iStripple<32; iStripple++)
    2020+:stipple:*{
    21 +:stipple:*     from->stipple[j] = to->stipple[j];
     21+:stipple:*     from->stipple[iStripple] = to->stipple[iStripple];
    2222+:stipple:*}

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_program.c

    r48491 r63199  
    23012301    CRProgram *pProgram = (CRProgram *) pProg;
    23022302    uint32_t i;
     2303    (void)key;
    23032304
    23042305    if (pProgram->isARBprogram)
    … …  
    23482349    CRProgram *pOrigVP, *pOrigFP;
    23492350
    2350     (void) bForceUpdate;
     2351    (void) bForceUpdate; (void)bitID;
    23512352
    23522353    /* save original bindings */

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_stencil.c

    r62814 r63199  
    102102static void crStateStencilBufferFunc(CRContext *g, CRStencilBufferState *s, GLenum func, GLint ref, GLuint mask)
    103103{
     104    (void)g;
    104105    s->func = func;
    105106    s->ref = ref;
    … …  
    171172static void STATE_APIENTRY crStateStencilBufferOp (CRContext *g, CRStencilBufferState *s, GLenum fail, GLenum zfail, GLenum zpass)
    172173{
     174    (void)g;
    173175    s->fail = fail;
    174176    s->passDepthFail = zfail;

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texdiff.c

    r44947 r63199  
    13791379    struct callback_info *info = (struct callback_info *) cbData;
    13801380    CRTextureObj *tobj = (CRTextureObj *) texObj;
     1381    (void)key;
     1382
    13811383    /*
    13821384    printf("  Checking %d 0x%x  bitid=0x%x\n",tobj->name, tobj->dirty[0], info->bitID[0]);

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_teximage.c

    r46235 r63199  
    575575    CRContext *g = GetCurrentContext();
    576576    CRTextureState *t = &(g->texture);
     577#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
    577578    CRClientState *c = &(g->client);
     579#endif
    578580    CRTextureObj *tobj;
    579581    CRTextureLevel *tl;
    580582    CRStateBits *sb = GetCurrentBits();
    581583    CRTextureBits *tb = &(sb->texture);
     584#ifdef CR_STATE_NO_TEXTURE_IMAGE_STORE
     585    (void)pixels;
     586#endif
    582587
    583588    FLUSH();
    … …  
    685690    CRTextureObj *tobj = NULL;
    686691    CRTextureLevel *tl = NULL;
     692    (void)x; (void)y;
    687693   
    688694    crStateGetTextureObjectAndImage(g, target, level, &tobj, &tl);
    … …  
    727733    CRContext *g = GetCurrentContext();
    728734    CRTextureState *t = &(g->texture);
     735#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
    729736    CRClientState *c = &(g->client);
     737#endif
    730738    CRTextureObj *tobj = NULL;
    731739    CRTextureLevel *tl = NULL;
    … …  
    864872    CRContext *g = GetCurrentContext();
    865873    CRTextureState *t = &(g->texture);
     874#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
    866875    CRClientState *c = &(g->client);
     876#endif
    867877    CRTextureObj *tobj = NULL;
    868878    CRTextureLevel *tl = NULL;
    869879    CRStateBits *sb = GetCurrentBits();
    870880    CRTextureBits *tb = &(sb->texture);
     881    (void)pixels;
    871882
    872883    FLUSH();
    … …  
    959970    CRContext *g = GetCurrentContext();
    960971    CRTextureState *t = &(g->texture);
     972#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
    961973    CRClientState *c = &(g->client);
     974#endif
    962975    CRStateBits *sb = GetCurrentBits();
    963976    CRTextureBits *tb = &(sb->texture);
    … …  
    965978    CRTextureObj *tobj = unit->currentTexture1D;
    966979    CRTextureLevel *tl = tobj->level[0] + level;
     980    (void)format; (void)type; (void)pixels;
    967981
    968982    FLUSH();
    … …  
    10101024{
    10111025    CRContext *g = GetCurrentContext();
    1012     CRClientState *c = &(g->client);
    10131026    CRStateBits *sb = GetCurrentBits();
    10141027    CRTextureBits *tb = &(sb->texture);
    10151028    CRTextureObj *tobj;
    10161029    CRTextureLevel *tl;
     1030#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     1031    CRClientState *c = &(g->client);
    10171032    GLubyte *subimg = NULL;
    10181033    GLubyte *img = NULL;
    1019 #ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
    10201034    GLubyte *src;
    10211035    int i;
    10221036#endif
     1037    (void)format; (void)type; (void)pixels;
    10231038
    10241039    FLUSH();
    … …  
    11051120    CRContext *g = GetCurrentContext();
    11061121    CRTextureState *t = &(g->texture);
    1107     CRClientState *c = &(g->client);
    11081122    CRStateBits *sb = GetCurrentBits();
    11091123    CRTextureBits *tb = &(sb->texture);
    … …  
    11111125    CRTextureObj *tobj = unit->currentTexture3D;
    11121126    CRTextureLevel *tl = tobj->level[0] + level;
     1127#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     1128    CRClientState *c = &(g->client);
    11131129    GLubyte *subimg = NULL;
    11141130    GLubyte *img = NULL;
    1115 #ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
    11161131    GLubyte *src;
    11171132    int i;
    11181133#endif
     1134    (void)format; (void)type; (void)pixels;
    11191135
    11201136    FLUSH();
    … …  
    11911207    CRStateBits *sb = GetCurrentBits();
    11921208    CRTextureBits *tb = &(sb->texture);
     1209    (void)data;
    11931210
    11941211    FLUSH();
    … …  
    12711288    CRStateBits *sb = GetCurrentBits();
    12721289    CRTextureBits *tb = &(sb->texture);
     1290    (void)data;
    12731291
    12741292    FLUSH();
    … …  
    13521370    CRStateBits *sb = GetCurrentBits();
    13531371    CRTextureBits *tb = &(sb->texture);
     1372    (void)data;
    13541373
    13551374    FLUSH();
    … …  
    14331452    CRTextureObj *tobj = unit->currentTexture1D;
    14341453    CRTextureLevel *tl = tobj->level[0] + level;
     1454    (void)format; (void)imageSize; (void)data;
    14351455
    14361456    FLUSH();
    … …  
    14901510    CRTextureObj *tobj = unit->currentTexture2D;
    14911511    CRTextureLevel *tl = tobj->level[0] + level;
     1512    (void)format; (void)imageSize; (void)data;
    14921513
    14931514    FLUSH();
    … …  
    15521573    CRTextureObj *tobj = unit->currentTexture3D;
    15531574    CRTextureLevel *tl = tobj->level[0] + level;
     1575    (void)format; (void)imageSize; (void)data;
    15541576
    15551577    FLUSH();
    … …  
    16481670{
    16491671    CRContext *g = GetCurrentContext();
     1672#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
    16501673    CRClientState *c = &(g->client);
     1674#endif
    16511675    CRTextureObj *tobj;
    16521676    CRTextureLevel *tl;

  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texture.c

    r58226 r63199  
    622622{
    623623    GLint i;
     624    (void)g;
    624625    for (i = 0; i < n; i++)
    625626    {
    … …  
    33903391    if (tobj)
    33913392    {
    3392 //        crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);
     3393/*        crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);*/
    33933394    }
    33943395#endif
    … …  
    34073408        CRASSERT(diff_api.GenTextures);
    34083409        diff_api.GenTextures(1, &tobj->hwid);
    3409 #if 0 //def DEBUG_misha
     3410#if 0 /*def DEBUG_misha*/
    34103411        crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);
    34113412#endif
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette