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

Commit 855eadf9 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Fix potential bug with reordered size/offset arguments."

parents 69726597 4cbe25a8

graphics/jni/android_renderscript_RenderScript.cpp

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 * Copyright (C) 2011-2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -567,7 +567,7 @@ nAllocationElementData1D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, 
    jint len = _env->GetArrayLength(data);

    LOG_API("nAllocationElementData1D, con(%p), alloc(%p), offset(%i), comp(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, compIdx, len, sizeBytes);

    jbyte *ptr = _env->GetByteArrayElements(data, NULL);

    rsAllocation1DElementData(con, (RsAllocation)alloc, offset, lod, ptr, compIdx, sizeBytes);

    rsAllocation1DElementData(con, (RsAllocation)alloc, offset, lod, ptr, sizeBytes, compIdx);

    _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT);

}

libs/rs/rs.spec

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ Allocation1DElementData { 
	param uint32_t x

	param uint32_t lod

	param const void *data

	param uint32_t comp_offset

	param size_t comp_offset

	}



Allocation2DData {
@@ -183,7 +183,7 @@ Allocation2DElementData { 
	param uint32_t lod

	param RsAllocationCubemapFace face

	param const void *data

	param uint32_t element_offset

	param size_t element_offset

	}



AllocationGenerateMipmaps {

libs/rs/rsAllocation.cpp

+18 −18
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 * Copyright (C) 2009-2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -71,11 +71,11 @@ void Allocation::read(void *data) { 
}



void Allocation::data(Context *rsc, uint32_t xoff, uint32_t lod,

                         uint32_t count, const void *data, uint32_t sizeBytes) {

    const uint32_t eSize = mHal.state.type->getElementSizeBytes();

                         uint32_t count, const void *data, size_t sizeBytes) {

    const size_t eSize = mHal.state.type->getElementSizeBytes();



    if ((count * eSize) != sizeBytes) {

        ALOGE("Allocation::subData called with mismatched size expected %i, got %i",

        ALOGE("Allocation::subData called with mismatched size expected %zu, got %zu",

             (count * eSize), sizeBytes);

        mHal.state.type->dumpLOGV("type info");

        return;
@@ -86,14 +86,14 @@ void Allocation::data(Context *rsc, uint32_t xoff, uint32_t lod, 
}



void Allocation::data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face,

             uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes) {

    const uint32_t eSize = mHal.state.elementSizeBytes;

    const uint32_t lineSize = eSize * w;

             uint32_t w, uint32_t h, const void *data, size_t sizeBytes) {

    const size_t eSize = mHal.state.elementSizeBytes;

    const size_t lineSize = eSize * w;



    //ALOGE("data2d %p,  %i %i %i %i %i %i %p %i", this, xoff, yoff, lod, face, w, h, data, sizeBytes);



    if ((lineSize * h) != sizeBytes) {

        ALOGE("Allocation size mismatch, expected %i, got %i", (lineSize * h), sizeBytes);

        ALOGE("Allocation size mismatch, expected %zu, got %zu", (lineSize * h), sizeBytes);

        rsAssert(!"Allocation::subData called with mismatched size");

        return;

    }
@@ -104,12 +104,12 @@ void Allocation::data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t lod, 


void Allocation::data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t zoff,

                      uint32_t lod, RsAllocationCubemapFace face,

                      uint32_t w, uint32_t h, uint32_t d, const void *data, uint32_t sizeBytes) {

                      uint32_t w, uint32_t h, uint32_t d, const void *data, size_t sizeBytes) {

}



void Allocation::elementData(Context *rsc, uint32_t x, const void *data,

                                uint32_t cIdx, uint32_t sizeBytes) {

    uint32_t eSize = mHal.state.elementSizeBytes;

                                uint32_t cIdx, size_t sizeBytes) {

    size_t eSize = mHal.state.elementSizeBytes;



    if (cIdx >= mHal.state.type->getElement()->getFieldCount()) {

        ALOGE("Error Allocation::subElementData component %i out of range.", cIdx);
@@ -125,7 +125,7 @@ void Allocation::elementData(Context *rsc, uint32_t x, const void *data, 


    const Element * e = mHal.state.type->getElement()->getField(cIdx);

    if (sizeBytes != e->getSizeBytes()) {

        ALOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes());

        ALOGE("Error Allocation::subElementData data size %zu does not match field size %zu.", sizeBytes, e->getSizeBytes());

        rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size.");

        return;

    }
@@ -135,8 +135,8 @@ void Allocation::elementData(Context *rsc, uint32_t x, const void *data, 
}



void Allocation::elementData(Context *rsc, uint32_t x, uint32_t y,

                                const void *data, uint32_t cIdx, uint32_t sizeBytes) {

    uint32_t eSize = mHal.state.elementSizeBytes;

                                const void *data, uint32_t cIdx, size_t sizeBytes) {

    size_t eSize = mHal.state.elementSizeBytes;



    if (x >= mHal.state.dimensionX) {

        ALOGE("Error Allocation::subElementData X offset %i out of range.", x);
@@ -159,7 +159,7 @@ void Allocation::elementData(Context *rsc, uint32_t x, uint32_t y, 
    const Element * e = mHal.state.type->getElement()->getField(cIdx);



    if (sizeBytes != e->getSizeBytes()) {

        ALOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes());

        ALOGE("Error Allocation::subElementData data size %zu does not match field size %zu.", sizeBytes, e->getSizeBytes());

        rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size.");

        return;

    }
@@ -249,7 +249,7 @@ void Allocation::writePackedData(const Type *type, 
    delete[] sizeUnpadded;

}



void Allocation::unpackVec3Allocation(const void *data, uint32_t dataSize) {

void Allocation::unpackVec3Allocation(const void *data, size_t dataSize) {

    const uint8_t *src = (const uint8_t*)data;

    uint8_t *dst = (uint8_t*)getPtr();
@@ -519,13 +519,13 @@ void rsi_Allocation1DData(Context *rsc, RsAllocation va, uint32_t xoff, uint32_t 
}



void rsi_Allocation2DElementData(Context *rsc, RsAllocation va, uint32_t x, uint32_t y, uint32_t lod, RsAllocationCubemapFace face,

                                 const void *data, size_t eoff, uint32_t sizeBytes) { // TODO: this seems wrong, eoff and sizeBytes may be swapped

                                 const void *data, size_t sizeBytes, size_t eoff) {

    Allocation *a = static_cast<Allocation *>(va);

    a->elementData(rsc, x, y, data, eoff, sizeBytes);

}



void rsi_Allocation1DElementData(Context *rsc, RsAllocation va, uint32_t x, uint32_t lod,

                                 const void *data, size_t eoff, uint32_t sizeBytes) { // TODO: this seems wrong, eoff and sizeBytes may be swapped

                                 const void *data, size_t sizeBytes, size_t eoff) {

    Allocation *a = static_cast<Allocation *>(va);

    a->elementData(rsc, x, data, eoff, sizeBytes);

}

libs/rs/rsAllocation.h

+7 −7
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 * Copyright (C) 2009-2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -80,16 +80,16 @@ public: 
    void resize1D(Context *rsc, uint32_t dimX);

    void resize2D(Context *rsc, uint32_t dimX, uint32_t dimY);



    void data(Context *rsc, uint32_t xoff, uint32_t lod, uint32_t count, const void *data, uint32_t sizeBytes);

    void data(Context *rsc, uint32_t xoff, uint32_t lod, uint32_t count, const void *data, size_t sizeBytes);

    void data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face,

                 uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes);

                 uint32_t w, uint32_t h, const void *data, size_t sizeBytes);

    void data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t zoff, uint32_t lod, RsAllocationCubemapFace face,

                 uint32_t w, uint32_t h, uint32_t d, const void *data, uint32_t sizeBytes);

                 uint32_t w, uint32_t h, uint32_t d, const void *data, size_t sizeBytes);



    void elementData(Context *rsc, uint32_t x,

                        const void *data, uint32_t elementOff, uint32_t sizeBytes);

                     const void *data, uint32_t elementOff, size_t sizeBytes);

    void elementData(Context *rsc, uint32_t x, uint32_t y,

                        const void *data, uint32_t elementOff, uint32_t sizeBytes);

                     const void *data, uint32_t elementOff, size_t sizeBytes);



    void read(void *data);
@@ -138,7 +138,7 @@ private: 


    uint32_t getPackedSize() const;

    static void writePackedData(const Type *type, uint8_t *dst, const uint8_t *src, bool dstPadded);

    void unpackVec3Allocation(const void *data, uint32_t dataSize);

    void unpackVec3Allocation(const void *data, size_t dataSize);

    void packVec3Allocation(OStream *stream) const;

};