Changeset 109838 in webkit


Ignore:
Timestamp:
Mar 5, 2012 8:02:32 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Change the argument orders to match OpenGL's in GraphicsContext3D functions
​https://bugs.webkit.org/show_bug.cgi?id=80120

Patch by Changhun Kang <​temoochin@company100.net> on 2012-03-05
Reviewed by Kenneth Russell.

No new tests because this patch just change the order of arguments.

Source/WebCore:

  • html/canvas/WebGLRenderingContext.cpp:

(WebCore):
(WebCore::WebGLRenderingContext::uniform1fv):
(WebCore::WebGLRenderingContext::uniform1iv):
(WebCore::WebGLRenderingContext::uniform2fv):
(WebCore::WebGLRenderingContext::uniform2iv):
(WebCore::WebGLRenderingContext::uniform3fv):
(WebCore::WebGLRenderingContext::uniform3iv):
(WebCore::WebGLRenderingContext::uniform4fv):
(WebCore::WebGLRenderingContext::uniform4iv):
(WebCore::WebGLRenderingContext::uniformMatrix2fv):
(WebCore::WebGLRenderingContext::uniformMatrix3fv):
(WebCore::WebGLRenderingContext::uniformMatrix4fv):

  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::drawDebugBorderQuad):
(WebCore::LayerRendererChromium::drawTileQuad):
(WebCore::LayerRendererChromium::drawYUV):
(WebCore::LayerRendererChromium::drawStreamTexture):
(WebCore::LayerRendererChromium::drawTexturedQuad):

  • platform/graphics/chromium/cc/CCRenderSurface.cpp:

(WebCore::CCRenderSurface::drawSurface):

  • platform/graphics/efl/GraphicsContext3DEfl.cpp:

(WebCore::GraphicsContext3D::uniform1fv):
(WebCore::GraphicsContext3D::uniform1iv):
(WebCore::GraphicsContext3D::uniform2fv):
(WebCore::GraphicsContext3D::uniform2iv):
(WebCore::GraphicsContext3D::uniform3fv):
(WebCore::GraphicsContext3D::uniform3iv):
(WebCore::GraphicsContext3D::uniform4fv):
(WebCore::GraphicsContext3D::uniform4iv):
(WebCore::GraphicsContext3D::uniformMatrix2fv):
(WebCore::GraphicsContext3D::uniformMatrix3fv):
(WebCore::GraphicsContext3D::uniformMatrix4fv):

  • platform/graphics/filters/FECustomFilter.cpp:

(WebCore::FECustomFilter::bindProgramAndBuffers):

  • platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::uniform1fv):
(WebCore::GraphicsContext3D::uniform2fv):
(WebCore::GraphicsContext3D::uniform3fv):
(WebCore::GraphicsContext3D::uniform4fv):
(WebCore::GraphicsContext3D::uniform1iv):
(WebCore::GraphicsContext3D::uniform2iv):
(WebCore::GraphicsContext3D::uniform3iv):
(WebCore::GraphicsContext3D::uniform4iv):
(WebCore::GraphicsContext3D::uniformMatrix2fv):
(WebCore::GraphicsContext3D::uniformMatrix3fv):
(WebCore::GraphicsContext3D::uniformMatrix4fv):

  • platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3D::uniform1fv):
(WebCore::GraphicsContext3D::uniform2fv):
(WebCore::GraphicsContext3D::uniform3fv):
(WebCore::GraphicsContext3D::uniform4fv):
(WebCore::GraphicsContext3D::uniform1iv):
(WebCore::GraphicsContext3D::uniform2iv):
(WebCore::GraphicsContext3D::uniform3iv):
(WebCore::GraphicsContext3D::uniform4iv):
(WebCore::GraphicsContext3D::uniformMatrix2fv):
(WebCore::GraphicsContext3D::uniformMatrix3fv):
(WebCore::GraphicsContext3D::uniformMatrix4fv):

Source/WebKit/chromium:

  • src/GraphicsContext3DChromium.cpp:

(WebCore::GraphicsContext3DPrivate::uniform1fv):
(WebCore::GraphicsContext3DPrivate::uniform1iv):
(WebCore::GraphicsContext3DPrivate::uniform2fv):
(WebCore::GraphicsContext3DPrivate::uniform2iv):
(WebCore::GraphicsContext3DPrivate::uniform3fv):
(WebCore::GraphicsContext3DPrivate::uniform3iv):
(WebCore::GraphicsContext3DPrivate::uniform4fv):
(WebCore::GraphicsContext3DPrivate::uniform4iv):
(WebCore::GraphicsContext3DPrivate::uniformMatrix2fv):
(WebCore::GraphicsContext3DPrivate::uniformMatrix3fv):
(WebCore::GraphicsContext3DPrivate::uniformMatrix4fv):
(WebCore):

  • src/GraphicsContext3DPrivate.h:

(GraphicsContext3DPrivate):

Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r109836 r109838  
     12012-03-05  Changhun Kang  <temoochin@company100.net>
     2
     3        Change the argument orders to match OpenGL's in GraphicsContext3D functions
     4        https://bugs.webkit.org/show_bug.cgi?id=80120
     5
     6        Reviewed by Kenneth Russell.
     7
     8        No new tests because this patch just change the order of arguments.
     9
     10        * html/canvas/WebGLRenderingContext.cpp:
     11        (WebCore):
     12        (WebCore::WebGLRenderingContext::uniform1fv):
     13        (WebCore::WebGLRenderingContext::uniform1iv):
     14        (WebCore::WebGLRenderingContext::uniform2fv):
     15        (WebCore::WebGLRenderingContext::uniform2iv):
     16        (WebCore::WebGLRenderingContext::uniform3fv):
     17        (WebCore::WebGLRenderingContext::uniform3iv):
     18        (WebCore::WebGLRenderingContext::uniform4fv):
     19        (WebCore::WebGLRenderingContext::uniform4iv):
     20        (WebCore::WebGLRenderingContext::uniformMatrix2fv):
     21        (WebCore::WebGLRenderingContext::uniformMatrix3fv):
     22        (WebCore::WebGLRenderingContext::uniformMatrix4fv):
     23        * platform/graphics/GraphicsContext3D.h:
     24        * platform/graphics/chromium/LayerRendererChromium.cpp:
     25        (WebCore::LayerRendererChromium::drawDebugBorderQuad):
     26        (WebCore::LayerRendererChromium::drawTileQuad):
     27        (WebCore::LayerRendererChromium::drawYUV):
     28        (WebCore::LayerRendererChromium::drawStreamTexture):
     29        (WebCore::LayerRendererChromium::drawTexturedQuad):
     30        * platform/graphics/chromium/cc/CCRenderSurface.cpp:
     31        (WebCore::CCRenderSurface::drawSurface):
     32        * platform/graphics/efl/GraphicsContext3DEfl.cpp:
     33        (WebCore::GraphicsContext3D::uniform1fv):
     34        (WebCore::GraphicsContext3D::uniform1iv):
     35        (WebCore::GraphicsContext3D::uniform2fv):
     36        (WebCore::GraphicsContext3D::uniform2iv):
     37        (WebCore::GraphicsContext3D::uniform3fv):
     38        (WebCore::GraphicsContext3D::uniform3iv):
     39        (WebCore::GraphicsContext3D::uniform4fv):
     40        (WebCore::GraphicsContext3D::uniform4iv):
     41        (WebCore::GraphicsContext3D::uniformMatrix2fv):
     42        (WebCore::GraphicsContext3D::uniformMatrix3fv):
     43        (WebCore::GraphicsContext3D::uniformMatrix4fv):
     44        * platform/graphics/filters/FECustomFilter.cpp:
     45        (WebCore::FECustomFilter::bindProgramAndBuffers):
     46        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
     47        (WebCore::GraphicsContext3D::uniform1fv):
     48        (WebCore::GraphicsContext3D::uniform2fv):
     49        (WebCore::GraphicsContext3D::uniform3fv):
     50        (WebCore::GraphicsContext3D::uniform4fv):
     51        (WebCore::GraphicsContext3D::uniform1iv):
     52        (WebCore::GraphicsContext3D::uniform2iv):
     53        (WebCore::GraphicsContext3D::uniform3iv):
     54        (WebCore::GraphicsContext3D::uniform4iv):
     55        (WebCore::GraphicsContext3D::uniformMatrix2fv):
     56        (WebCore::GraphicsContext3D::uniformMatrix3fv):
     57        (WebCore::GraphicsContext3D::uniformMatrix4fv):
     58        * platform/graphics/qt/GraphicsContext3DQt.cpp:
     59        (WebCore::GraphicsContext3D::uniform1fv):
     60        (WebCore::GraphicsContext3D::uniform2fv):
     61        (WebCore::GraphicsContext3D::uniform3fv):
     62        (WebCore::GraphicsContext3D::uniform4fv):
     63        (WebCore::GraphicsContext3D::uniform1iv):
     64        (WebCore::GraphicsContext3D::uniform2iv):
     65        (WebCore::GraphicsContext3D::uniform3iv):
     66        (WebCore::GraphicsContext3D::uniform4iv):
     67        (WebCore::GraphicsContext3D::uniformMatrix2fv):
     68        (WebCore::GraphicsContext3D::uniformMatrix3fv):
     69        (WebCore::GraphicsContext3D::uniformMatrix4fv):
     70
    1712012-03-05  Yoshifumi Inoue  <yosin@chromium.org>
    272

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r109798 r109838  
    37493749        return;
    37503750
    3751     m_context->uniform1fv(location->location(), v->data(), v->length());
     3751    m_context->uniform1fv(location->location(), v->length(), v->data());
    37523752    cleanupAfterGraphicsCall(false);
    37533753}
    … …  
    37593759        return;
    37603760
    3761     m_context->uniform1fv(location->location(), v, size);
     3761    m_context->uniform1fv(location->location(), size, v);
    37623762    cleanupAfterGraphicsCall(false);
    37633763}
    … …  
    37843784        return;
    37853785
    3786     m_context->uniform1iv(location->location(), v->data(), v->length());
     3786    m_context->uniform1iv(location->location(), v->length(), v->data());
    37873787    cleanupAfterGraphicsCall(false);
    37883788}
    … …  
    37943794        return;
    37953795
    3796     m_context->uniform1iv(location->location(), v, size);
     3796    m_context->uniform1iv(location->location(), size, v);
    37973797    cleanupAfterGraphicsCall(false);
    37983798}
    … …  
    38193819        return;
    38203820
    3821     m_context->uniform2fv(location->location(), v->data(), v->length() / 2);
     3821    m_context->uniform2fv(location->location(), v->length() / 2, v->data());
    38223822    cleanupAfterGraphicsCall(false);
    38233823}
    … …  
    38293829        return;
    38303830
    3831     m_context->uniform2fv(location->location(), v, size / 2);
     3831    m_context->uniform2fv(location->location(), size / 2, v);
    38323832    cleanupAfterGraphicsCall(false);
    38333833}
    … …  
    38543854        return;
    38553855
    3856     m_context->uniform2iv(location->location(), v->data(), v->length() / 2);
     3856    m_context->uniform2iv(location->location(), v->length() / 2, v->data());
    38573857    cleanupAfterGraphicsCall(false);
    38583858}
    … …  
    38643864        return;
    38653865
    3866     m_context->uniform2iv(location->location(), v, size / 2);
     3866    m_context->uniform2iv(location->location(), size / 2, v);
    38673867    cleanupAfterGraphicsCall(false);
    38683868}
    … …  
    38893889        return;
    38903890
    3891     m_context->uniform3fv(location->location(), v->data(), v->length() / 3);
     3891    m_context->uniform3fv(location->location(), v->length() / 3, v->data());
    38923892    cleanupAfterGraphicsCall(false);
    38933893}
    … …  
    38993899        return;
    39003900
    3901     m_context->uniform3fv(location->location(), v, size / 3);
     3901    m_context->uniform3fv(location->location(), size / 3, v);
    39023902    cleanupAfterGraphicsCall(false);
    39033903}
    … …  
    39243924        return;
    39253925
    3926     m_context->uniform3iv(location->location(), v->data(), v->length() / 3);
     3926    m_context->uniform3iv(location->location(), v->length() / 3, v->data());
    39273927    cleanupAfterGraphicsCall(false);
    39283928}
    … …  
    39343934        return;
    39353935
    3936     m_context->uniform3iv(location->location(), v, size / 3);
     3936    m_context->uniform3iv(location->location(), size / 3, v);
    39373937    cleanupAfterGraphicsCall(false);
    39383938}
    … …  
    39593959        return;
    39603960
    3961     m_context->uniform4fv(location->location(), v->data(), v->length() / 4);
     3961    m_context->uniform4fv(location->location(), v->length() / 4, v->data());
    39623962    cleanupAfterGraphicsCall(false);
    39633963}
    … …  
    39693969        return;
    39703970
    3971     m_context->uniform4fv(location->location(), v, size / 4);
     3971    m_context->uniform4fv(location->location(), size / 4, v);
    39723972    cleanupAfterGraphicsCall(false);
    39733973}
    … …  
    39943994        return;
    39953995
    3996     m_context->uniform4iv(location->location(), v->data(), v->length() / 4);
     3996    m_context->uniform4iv(location->location(), v->length() / 4, v->data());
    39973997    cleanupAfterGraphicsCall(false);
    39983998}
    … …  
    40044004        return;
    40054005
    4006     m_context->uniform4iv(location->location(), v, size / 4);
     4006    m_context->uniform4iv(location->location(), size / 4, v);
    40074007    cleanupAfterGraphicsCall(false);
    40084008}
    … …  
    40134013    if (isContextLost() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, 4))
    40144014        return;
    4015     m_context->uniformMatrix2fv(location->location(), transpose, v->data(), v->length() / 4);
     4015    m_context->uniformMatrix2fv(location->location(), v->length() / 4, transpose, v->data());
    40164016    cleanupAfterGraphicsCall(false);
    40174017}
    … …  
    40224022    if (isContextLost() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, size, 4))
    40234023        return;
    4024     m_context->uniformMatrix2fv(location->location(), transpose, v, size / 4);
     4024    m_context->uniformMatrix2fv(location->location(), size / 4, transpose, v);
    40254025    cleanupAfterGraphicsCall(false);
    40264026}
    … …  
    40314031    if (isContextLost() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, 9))
    40324032        return;
    4033     m_context->uniformMatrix3fv(location->location(), transpose, v->data(), v->length() / 9);
     4033    m_context->uniformMatrix3fv(location->location(), v->length() / 9, transpose, v->data());
    40344034    cleanupAfterGraphicsCall(false);
    40354035}
    … …  
    40404040    if (isContextLost() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, size, 9))
    40414041        return;
    4042     m_context->uniformMatrix3fv(location->location(), transpose, v, size / 9);
     4042    m_context->uniformMatrix3fv(location->location(), size / 9, transpose, v);
    40434043    cleanupAfterGraphicsCall(false);
    40444044}
    … …  
    40494049    if (isContextLost() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, 16))
    40504050        return;
    4051     m_context->uniformMatrix4fv(location->location(), transpose, v->data(), v->length() / 16);
     4051    m_context->uniformMatrix4fv(location->location(), v->length() / 16, transpose, v->data());
    40524052    cleanupAfterGraphicsCall(false);
    40534053}
    … …  
    40584058    if (isContextLost() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, size, 16))
    40594059        return;
    4060     m_context->uniformMatrix4fv(location->location(), transpose, v, size / 16);
     4060    m_context->uniformMatrix4fv(location->location(), size / 16, transpose, v);
    40614061    cleanupAfterGraphicsCall(false);
    40624062}

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r109609 r109838  
    757757    void texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels);
    758758
    759     // FIXME: change the argument orders to match OpenGL's.
    760759    void uniform1f(GC3Dint location, GC3Dfloat x);
    761     void uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size);
     760    void uniform1fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    762761    void uniform1i(GC3Dint location, GC3Dint x);
    763     void uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size);
    764     void uniform2f(GC3Dint location, GC3Dfloat x, float y);
    765     void uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size);
     762    void uniform1iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
     763    void uniform2f(GC3Dint location, GC3Dfloat x, GC3Dfloat y);
     764    void uniform2fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    766765    void uniform2i(GC3Dint location, GC3Dint x, GC3Dint y);
    767     void uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size);
     766    void uniform2iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
    768767    void uniform3f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z);
    769     void uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size);
     768    void uniform3fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    770769    void uniform3i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z);
    771     void uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size);
     770    void uniform3iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
    772771    void uniform4f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w);
    773     void uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size);
     772    void uniform4fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    774773    void uniform4i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w);
    775     void uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size);
    776     void uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size);
    777     void uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size);
    778     void uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size);
     774    void uniform4iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
     775    void uniformMatrix2fv(GC3Dint location, GC3Dsizei, GC3Dboolean transpose, GC3Dfloat* value);
     776    void uniformMatrix3fv(GC3Dint location, GC3Dsizei, GC3Dboolean transpose, GC3Dfloat* value);
     777    void uniformMatrix4fv(GC3Dint location, GC3Dsizei, GC3Dboolean transpose, GC3Dfloat* value);
    779778
    780779    void useProgram(Platform3DObject);

  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

    r109528 r109838  
    472472    renderMatrix.scaleNonUniform(layerRect.width(), layerRect.height());
    473473    LayerRendererChromium::toGLMatrix(&glMatrix[0], projectionMatrix() * renderMatrix);
    474     GLC(context(), context()->uniformMatrix4fv(program->vertexShader().matrixLocation(), false, &glMatrix[0], 1));
     474    GLC(context(), context()->uniformMatrix4fv(program->vertexShader().matrixLocation(), 1, false, &glMatrix[0]));
    475475
    476476    GLC(context(), context()->uniform4f(program->fragmentShader().colorLocation(), quad->color().red() / 255.0, quad->color().green() / 255.0, quad->color().blue() / 255.0, quad->color().alpha() / 255.0));
    … …  
    627627        deviceLayerEdges.toFloatArray(edge);
    628628        deviceLayerBounds.toFloatArray(&edge[12]);
    629         GLC(context(), context()->uniform3fv(uniforms.edgeLocation, edge, 8));
     629        GLC(context(), context()->uniform3fv(uniforms.edgeLocation, 8, edge));
    630630
    631631        GLC(context(), context()->uniform4f(uniforms.vertexTexTransformLocation, vertexTexTranslateX, vertexTexTranslateY, vertexTexScaleX, vertexTexScaleY));
    … …  
    746746    GLC(context(), context()->uniform1i(program->fragmentShader().vTextureLocation(), 3));
    747747
    748     GLC(context(), context()->uniformMatrix3fv(program->fragmentShader().ccMatrixLocation(), 0, const_cast<float*>(CCVideoLayerImpl::yuv2RGB), 1));
    749     GLC(context(), context()->uniform3fv(program->fragmentShader().yuvAdjLocation(), const_cast<float*>(CCVideoLayerImpl::yuvAdjust), 1));
     748    GLC(context(), context()->uniformMatrix3fv(program->fragmentShader().ccMatrixLocation(), 1, 0, const_cast<float*>(CCVideoLayerImpl::yuv2RGB)));
     749    GLC(context(), context()->uniform3fv(program->fragmentShader().yuvAdjLocation(), 1, const_cast<float*>(CCVideoLayerImpl::yuvAdjust)));
    750750
    751751    const IntSize& bounds = quad->quadRect().size();
    … …  
    799799    GLC(context(), context()->useProgram(program->program()));
    800800    ASSERT(quad->matrix());
    801     GLC(context(), context()->uniformMatrix4fv(program->vertexShader().texMatrixLocation(), false, const_cast<float*>(quad->matrix()), 1));
     801    GLC(context(), context()->uniformMatrix4fv(program->vertexShader().texMatrixLocation(), 1, false, const_cast<float*>(quad->matrix())));
    802802
    803803    drawSingleTextureVideoQuad(quad, program, 1, quad->frame()->textureId(), Extensions3DChromium::GL_TEXTURE_EXTERNAL_OES);
    … …  
    10141014    toGLMatrix(&glMatrix[0], m_projectionMatrix * renderMatrix);
    10151015
    1016     GLC(m_context, m_context->uniformMatrix4fv(matrixLocation, false, &glMatrix[0], 1));
     1016    GLC(m_context, m_context->uniformMatrix4fv(matrixLocation, 1, false, &glMatrix[0]));
    10171017
    10181018    if (quadLocation != -1) {
    … …  
    10261026        point[6] = quad.p4().x();
    10271027        point[7] = quad.p4().y();
    1028         GLC(m_context, m_context->uniform2fv(quadLocation, point, 4));
     1028        GLC(m_context, m_context->uniform2fv(quadLocation, 4, point));
    10291029    }
    10301030

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.cpp

    r109781 r109838  
    208208        layerQuad.toFloatArray(edge);
    209209        deviceRect.toFloatArray(&edge[12]);
    210         GLC(context3D, context3D->uniform3fv(shaderEdgeLocation, edge, 8));
     210        GLC(context3D, context3D->uniform3fv(shaderEdgeLocation, 8, edge));
    211211    }
    212212

  • trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp

    r108938 r109838  
    555555}
    556556
    557 void GraphicsContext3D::uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     557void GraphicsContext3D::uniform1fv(GC3Dint location, GGC3Dsizei size, C3Dfloat* v)
    558558{
    559559    m_private->uniform1fv(location, size, v);
    … …  
    565565}
    566566
    567 void GraphicsContext3D::uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     567void GraphicsContext3D::uniform1iv(GC3Dint location, GGC3Dsizei size, C3Dint* v)
    568568{
    569569    m_private->uniform1iv(location, size, v);
    … …  
    575575}
    576576
    577 void GraphicsContext3D::uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     577void GraphicsContext3D::uniform2fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* v)
    578578{
    579579    m_private->uniform2fv(location, size, v);
    … …  
    585585}
    586586
    587 void GraphicsContext3D::uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     587void GraphicsContext3D::uniform2iv(GC3Dint location, GC3Dsizei size, GC3Dint* v)
    588588{
    589589    m_private->uniform2iv(location, size, v);
    … …  
    595595}
    596596
    597 void GraphicsContext3D::uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     597void GraphicsContext3D::uniform3fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* v)
    598598{
    599599    m_private->uniform3fv(location, size, v);
    … …  
    605605}
    606606
    607 void GraphicsContext3D::uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     607void GraphicsContext3D::uniform3iv(GC3Dint location, GC3Dsizei size, GC3Dint* v)
    608608{
    609609    m_private->uniform3iv(location, size, v);
    … …  
    615615}
    616616
    617 void GraphicsContext3D::uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     617void GraphicsContext3D::uniform4fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* v)
    618618{
    619619    m_private->uniform4fv(location, size, v);
    … …  
    625625}
    626626
    627 void GraphicsContext3D::uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     627void GraphicsContext3D::uniform4iv(GC3Dint location, GC3Dsizei size, GC3Dint* v)
    628628{
    629629    m_private->uniform4iv(location, size, v);
    630630}
    631631
    632 void GraphicsContext3D::uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size)
     632void GraphicsContext3D::uniformMatrix2fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* value)
    633633{
    634634    m_private->uniformMatrix2fv(location, size, transpose, value);
    635635}
    636636
    637 void GraphicsContext3D::uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size)
     637void GraphicsContext3D::uniformMatrix3fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* value)
    638638{
    639639    m_private->uniformMatrix3fv(location, size, transpose, value);
    640640}
    641641
    642 void GraphicsContext3D::uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size)
     642void GraphicsContext3D::uniformMatrix4fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* value)
    643643{
    644644    m_private->uniformMatrix4fv(location, size, transpose, value);

  • trunk/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp

    r108952 r109838  
    230230        float glProjectionMatrix[16];
    231231        projectionMatrix.toColumnMajorFloatArray(glProjectionMatrix);
    232         m_context->uniformMatrix4fv(m_shader->projectionMatrixLocation(), false, &glProjectionMatrix[0], 1);
     232        m_context->uniformMatrix4fv(m_shader->projectionMatrixLocation(), 1, false, &glProjectionMatrix[0]);
    233233    }
    234234   

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

    r109609 r109838  
    908908}
    909909
    910 void GraphicsContext3D::uniform1fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     910void GraphicsContext3D::uniform1fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* array)
    911911{
    912912    makeContextCurrent();
    … …  
    920920}
    921921
    922 void GraphicsContext3D::uniform2fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     922void GraphicsContext3D::uniform2fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* array)
    923923{
    924924    // FIXME: length needs to be a multiple of 2.
    … …  
    933933}
    934934
    935 void GraphicsContext3D::uniform3fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     935void GraphicsContext3D::uniform3fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* array)
    936936{
    937937    // FIXME: length needs to be a multiple of 3.
    … …  
    946946}
    947947
    948 void GraphicsContext3D::uniform4fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     948void GraphicsContext3D::uniform4fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* array)
    949949{
    950950    // FIXME: length needs to be a multiple of 4.
    … …  
    959959}
    960960
    961 void GraphicsContext3D::uniform1iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     961void GraphicsContext3D::uniform1iv(GC3Dint location, GC3Dsizei size, GC3Dint* array)
    962962{
    963963    makeContextCurrent();
    … …  
    971971}
    972972
    973 void GraphicsContext3D::uniform2iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     973void GraphicsContext3D::uniform2iv(GC3Dint location, GC3Dsizei size, GC3Dint* array)
    974974{
    975975    // FIXME: length needs to be a multiple of 2.
    … …  
    984984}
    985985
    986 void GraphicsContext3D::uniform3iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     986void GraphicsContext3D::uniform3iv(GC3Dint location, GC3Dsizei size, GC3Dint* array)
    987987{
    988988    // FIXME: length needs to be a multiple of 3.
    … …  
    997997}
    998998
    999 void GraphicsContext3D::uniform4iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     999void GraphicsContext3D::uniform4iv(GC3Dint location, GC3Dsizei size, GC3Dint* array)
    10001000{
    10011001    // FIXME: length needs to be a multiple of 4.
    … …  
    10041004}
    10051005
    1006 void GraphicsContext3D::uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size)
     1006void GraphicsContext3D::uniformMatrix2fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* array)
    10071007{
    10081008    // FIXME: length needs to be a multiple of 4.
    … …  
    10111011}
    10121012
    1013 void GraphicsContext3D::uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size)
     1013void GraphicsContext3D::uniformMatrix3fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* array)
    10141014{
    10151015    // FIXME: length needs to be a multiple of 9.
    … …  
    10181018}
    10191019
    1020 void GraphicsContext3D::uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size)
     1020void GraphicsContext3D::uniformMatrix4fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* array)
    10211021{
    10221022    // FIXME: length needs to be a multiple of 16.

  • trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

    r108438 r109838  
    10881088}
    10891089
    1090 void GraphicsContext3D::uniform1fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     1090void GraphicsContext3D::uniform1fv(GC3Dint location, GGC3Dsizei size, C3Dfloat* array)
    10911091{
    10921092    makeContextCurrent();
    … …  
    11001100}
    11011101
    1102 void GraphicsContext3D::uniform2fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     1102void GraphicsContext3D::uniform2fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* array)
    11031103{
    11041104    makeContextCurrent();
    … …  
    11121112}
    11131113
    1114 void GraphicsContext3D::uniform3fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     1114void GraphicsContext3D::uniform3fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* array)
    11151115{
    11161116    makeContextCurrent();
    … …  
    11241124}
    11251125
    1126 void GraphicsContext3D::uniform4fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size)
     1126void GraphicsContext3D::uniform4fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* array)
    11271127{
    11281128    makeContextCurrent();
    … …  
    11361136}
    11371137
    1138 void GraphicsContext3D::uniform1iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     1138void GraphicsContext3D::uniform1iv(GC3Dint location, GGC3Dsizei size, C3Dint* array)
    11391139{
    11401140    makeContextCurrent();
    … …  
    11481148}
    11491149
    1150 void GraphicsContext3D::uniform2iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     1150void GraphicsContext3D::uniform2iv(GC3Dint location, GC3Dsizei size, GC3Dint* array)
    11511151{
    11521152    makeContextCurrent();
    … …  
    11601160}
    11611161
    1162 void GraphicsContext3D::uniform3iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     1162void GraphicsContext3D::uniform3iv(GC3Dint location, GC3Dsizei size, GC3Dint* array)
    11631163{
    11641164    makeContextCurrent();
    … …  
    11721172}
    11731173
    1174 void GraphicsContext3D::uniform4iv(GC3Dint location, GC3Dint* array, GC3Dsizei size)
     1174void GraphicsContext3D::uniform4iv(GC3Dint location, GC3Dsizei size, GC3Dint* array)
    11751175{
    11761176    makeContextCurrent();
    … …  
    11781178}
    11791179
    1180 void GraphicsContext3D::uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size)
     1180void GraphicsContext3D::uniformMatrix2fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* array)
    11811181{
    11821182    makeContextCurrent();
    … …  
    11841184}
    11851185
    1186 void GraphicsContext3D::uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size)
     1186void GraphicsContext3D::uniformMatrix3fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* array)
    11871187{
    11881188    makeContextCurrent();
    … …  
    11901190}
    11911191
    1192 void GraphicsContext3D::uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size)
     1192void GraphicsContext3D::uniformMatrix4fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* array)
    11931193{
    11941194    makeContextCurrent();

  • trunk/Source/WebKit/chromium/ChangeLog

    r109827 r109838  
     12012-03-05  Changhun Kang  <temoochin@company100.net>
     2
     3        Change the argument orders to match OpenGL's in GraphicsContext3D functions
     4        https://bugs.webkit.org/show_bug.cgi?id=80120
     5
     6        Reviewed by Kenneth Russell.
     7
     8        No new tests because this patch just change the order of arguments.
     9
     10        * src/GraphicsContext3DChromium.cpp:
     11        (WebCore::GraphicsContext3DPrivate::uniform1fv):
     12        (WebCore::GraphicsContext3DPrivate::uniform1iv):
     13        (WebCore::GraphicsContext3DPrivate::uniform2fv):
     14        (WebCore::GraphicsContext3DPrivate::uniform2iv):
     15        (WebCore::GraphicsContext3DPrivate::uniform3fv):
     16        (WebCore::GraphicsContext3DPrivate::uniform3iv):
     17        (WebCore::GraphicsContext3DPrivate::uniform4fv):
     18        (WebCore::GraphicsContext3DPrivate::uniform4iv):
     19        (WebCore::GraphicsContext3DPrivate::uniformMatrix2fv):
     20        (WebCore::GraphicsContext3DPrivate::uniformMatrix3fv):
     21        (WebCore::GraphicsContext3DPrivate::uniformMatrix4fv):
     22        (WebCore):
     23        * src/GraphicsContext3DPrivate.h:
     24        (GraphicsContext3DPrivate):
     25
    1262012-03-05  Yoshifumi Inoue  <yosin@chromium.org>
    227

  • trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

    r108840 r109838  
    673673DELEGATE_TO_IMPL_2(uniform1f, GC3Dint, GC3Dfloat)
    674674
    675 void GraphicsContext3DPrivate::uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     675void GraphicsContext3DPrivate::uniform1fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* v)
    676676{
    677677    m_impl->uniform1fv(location, size, v);
    … …  
    680680DELEGATE_TO_IMPL_2(uniform1i, GC3Dint, GC3Dint)
    681681
    682 void GraphicsContext3DPrivate::uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     682void GraphicsContext3DPrivate::uniform1iv(GC3Dint location, GC3Dsizei size, GC3Dint* v)
    683683{
    684684    m_impl->uniform1iv(location, size, v);
    … …  
    687687DELEGATE_TO_IMPL_3(uniform2f, GC3Dint, GC3Dfloat, GC3Dfloat)
    688688
    689 void GraphicsContext3DPrivate::uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     689void GraphicsContext3DPrivate::uniform2fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* v)
    690690{
    691691    m_impl->uniform2fv(location, size, v);
    … …  
    694694DELEGATE_TO_IMPL_3(uniform2i, GC3Dint, GC3Dint, GC3Dint)
    695695
    696 void GraphicsContext3DPrivate::uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     696void GraphicsContext3DPrivate::uniform2iv(GC3Dint location, GC3Dsizei size, GC3Dint* v)
    697697{
    698698    m_impl->uniform2iv(location, size, v);
    … …  
    701701DELEGATE_TO_IMPL_4(uniform3f, GC3Dint, GC3Dfloat, GC3Dfloat, GC3Dfloat)
    702702
    703 void GraphicsContext3DPrivate::uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     703void GraphicsContext3DPrivate::uniform3fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* v)
    704704{
    705705    m_impl->uniform3fv(location, size, v);
    … …  
    708708DELEGATE_TO_IMPL_4(uniform3i, GC3Dint, GC3Dint, GC3Dint, GC3Dint)
    709709
    710 void GraphicsContext3DPrivate::uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     710void GraphicsContext3DPrivate::uniform3iv(GC3Dint location, GC3Dsizei size, GC3Dint* v)
    711711{
    712712    m_impl->uniform3iv(location, size, v);
    … …  
    715715DELEGATE_TO_IMPL_5(uniform4f, GC3Dint, GC3Dfloat, GC3Dfloat, GC3Dfloat, GC3Dfloat)
    716716
    717 void GraphicsContext3DPrivate::uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size)
     717void GraphicsContext3DPrivate::uniform4fv(GC3Dint location, GC3Dsizei size, GC3Dfloat* v)
    718718{
    719719    m_impl->uniform4fv(location, size, v);
    … …  
    722722DELEGATE_TO_IMPL_5(uniform4i, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint)
    723723
    724 void GraphicsContext3DPrivate::uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size)
     724void GraphicsContext3DPrivate::uniform4iv(GC3Dint location, GC3Dsizei size, GC3Dint* v)
    725725{
    726726    m_impl->uniform4iv(location, size, v);
    727727}
    728728
    729 void GraphicsContext3DPrivate::uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size)
     729void GraphicsContext3DPrivate::uniformMatrix2fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* value)
    730730{
    731731    m_impl->uniformMatrix2fv(location, size, transpose, value);
    732732}
    733733
    734 void GraphicsContext3DPrivate::uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size)
     734void GraphicsContext3DPrivate::uniformMatrix3fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* value)
    735735{
    736736    m_impl->uniformMatrix3fv(location, size, transpose, value);
    737737}
    738738
    739 void GraphicsContext3DPrivate::uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size)
     739void GraphicsContext3DPrivate::uniformMatrix4fv(GC3Dint location, GC3Dsizei size, GC3Dboolean transpose, GC3Dfloat* value)
    740740{
    741741    m_impl->uniformMatrix4fv(location, size, transpose, value);
    … …  
    11771177
    11781178DELEGATE_TO_INTERNAL_2(uniform1f, GC3Dint, GC3Dfloat)
    1179 DELEGATE_TO_INTERNAL_3(uniform1fv, GC3Dint, GC3Dfloat*, GC3Dsizei)
     1179DELEGATE_TO_INTERNAL_3(uniform1fv, GC3Dint, GC3Dsizei, GC3Dfloat*)
    11801180DELEGATE_TO_INTERNAL_2(uniform1i, GC3Dint, GC3Dint)
    1181 DELEGATE_TO_INTERNAL_3(uniform1iv, GC3Dint, GC3Dint*, GC3Dsizei)
     1181DELEGATE_TO_INTERNAL_3(uniform1iv, GC3Dint, GC3Dsizei, GC3Dint*)
    11821182DELEGATE_TO_INTERNAL_3(uniform2f, GC3Dint, GC3Dfloat, GC3Dfloat)
    1183 DELEGATE_TO_INTERNAL_3(uniform2fv, GC3Dint, GC3Dfloat*, GC3Dsizei)
     1183DELEGATE_TO_INTERNAL_3(uniform2fv, GC3Dint, GC3Dsizei, GC3Dfloat*)
    11841184DELEGATE_TO_INTERNAL_3(uniform2i, GC3Dint, GC3Dint, GC3Dint)
    1185 DELEGATE_TO_INTERNAL_3(uniform2iv, GC3Dint, GC3Dint*, GC3Dsizei)
     1185DELEGATE_TO_INTERNAL_3(uniform2iv, GC3Dint, GC3Dsizei, GC3Dint*)
    11861186DELEGATE_TO_INTERNAL_4(uniform3f, GC3Dint, GC3Dfloat, GC3Dfloat, GC3Dfloat)
    1187 DELEGATE_TO_INTERNAL_3(uniform3fv, GC3Dint, GC3Dfloat*, GC3Dsizei)
     1187DELEGATE_TO_INTERNAL_3(uniform3fv, GC3Dint, GC3Dsizei, GC3Dfloat*)
    11881188DELEGATE_TO_INTERNAL_4(uniform3i, GC3Dint, GC3Dint, GC3Dint, GC3Dint)
    1189 DELEGATE_TO_INTERNAL_3(uniform3iv, GC3Dint, GC3Dint*, GC3Dsizei)
     1189DELEGATE_TO_INTERNAL_3(uniform3iv, GC3Dint, GC3Dsizei, GC3Dint*)
    11901190DELEGATE_TO_INTERNAL_5(uniform4f, GC3Dint, GC3Dfloat, GC3Dfloat, GC3Dfloat, GC3Dfloat)
    1191 DELEGATE_TO_INTERNAL_3(uniform4fv, GC3Dint, GC3Dfloat*, GC3Dsizei)
     1191DELEGATE_TO_INTERNAL_3(uniform4fv, GC3Dint, GC3Dsizei, GC3Dfloat*)
    11921192DELEGATE_TO_INTERNAL_5(uniform4i, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint)
    1193 DELEGATE_TO_INTERNAL_3(uniform4iv, GC3Dint, GC3Dint*, GC3Dsizei)
    1194 DELEGATE_TO_INTERNAL_4(uniformMatrix2fv, GC3Dint, GC3Dboolean, GC3Dfloat*, GC3Dsizei)
    1195 DELEGATE_TO_INTERNAL_4(uniformMatrix3fv, GC3Dint, GC3Dboolean, GC3Dfloat*, GC3Dsizei)
    1196 DELEGATE_TO_INTERNAL_4(uniformMatrix4fv, GC3Dint, GC3Dboolean, GC3Dfloat*, GC3Dsizei)
     1193DELEGATE_TO_INTERNAL_3(uniform4iv, GC3Dint, GC3Dsizei, GC3Dint*)
     1194DELEGATE_TO_INTERNAL_4(uniformMatrix2fv, GC3Dint, GC3Dsizei, GC3Dboolean, GC3Dfloat*)
     1195DELEGATE_TO_INTERNAL_4(uniformMatrix3fv, GC3Dint, GC3Dsizei, GC3Dboolean, GC3Dfloat*)
     1196DELEGATE_TO_INTERNAL_4(uniformMatrix4fv, GC3Dint, GC3Dsizei, GC3Dboolean, GC3Dfloat*)
    11971197
    11981198DELEGATE_TO_INTERNAL_1(useProgram, Platform3DObject)

  • trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h

    r108706 r109838  
    210210
    211211    void uniform1f(GC3Dint location, GC3Dfloat x);
    212     void uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei);
     212    void uniform1fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    213213    void uniform1i(GC3Dint location, GC3Dint x);
    214     void uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei);
     214    void uniform1iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
    215215    void uniform2f(GC3Dint location, GC3Dfloat x, float y);
    216     void uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei);
     216    void uniform2fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    217217    void uniform2i(GC3Dint location, GC3Dint x, GC3Dint y);
    218     void uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei);
     218    void uniform2iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
    219219    void uniform3f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z);
    220     void uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei);
     220    void uniform3fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    221221    void uniform3i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z);
    222     void uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei);
     222    void uniform3iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
    223223    void uniform4f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w);
    224     void uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei);
     224    void uniform4fv(GC3Dint location, GC3Dsizei, GC3Dfloat* v);
    225225    void uniform4i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w);
    226     void uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei);
    227     void uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei);
    228     void uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei);
    229     void uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei);
     226    void uniform4iv(GC3Dint location, GC3Dsizei, GC3Dint* v);
     227    void uniformMatrix2fv(GC3Dint location, GC3Dsizei, GC3Dboolean transpose, GC3Dfloat* value);
     228    void uniformMatrix3fv(GC3Dint location, GC3Dsizei, GC3Dboolean transpose, GC3Dfloat* value);
     229    void uniformMatrix4fv(GC3Dint location, GC3Dsizei, GC3Dboolean transpose, GC3Dfloat* value);
    230230
    231231    void useProgram(Platform3DObject);
Note: See TracChangeset for help on using the changeset viewer.