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

Commit ed0fd523 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Add code for generating fifo command packing."

parents e09089d8 7a22e107

graphics/jni/android_renderscript_RenderScript.cpp

+1 −2
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ nElementCreate2(JNIEnv *_env, jobject _this, RsContext con, jintArray _ids, jobj 
    }

    jint id = (jint)rsElementCreate2(con,

                                     (RsElement *)ids, fieldCount,

                                     nameArray, fieldCount,

                                     sizeArray, fieldCount,

                                     nameArray, fieldCount * sizeof(size_t),  sizeArray,

                                     (const uint32_t *)arraySizes, fieldCount);

    for (int ct=0; ct < fieldCount; ct++) {

        jstring s = (jstring)_env->GetObjectArrayElement(_names, ct);

libs/rs/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ LOCAL_SRC_FILES:= \ 
	rsDevice.cpp \

	rsElement.cpp \

	rsFBOCache.cpp \

	rsFifoSocket.cpp \

	rsFileA3D.cpp \

	rsFont.cpp \

	rsLocklessFifo.cpp \

libs/rs/rs.spec

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ ElementCreate { 
ElementCreate2 {

	param const RsElement * elements

	param const char ** names

	param const size_t * nameLengths

	param const uint32_t * arraySize

	ret RsElement

	}

libs/rs/rsElement.cpp

+4 −2
Original line number Diff line number Diff line
@@ -347,13 +347,15 @@ RsElement rsi_ElementCreate(Context *rsc, 
    return (RsElement)e;

}





RsElement rsi_ElementCreate2(Context *rsc,

                             const RsElement * ein,

                             size_t ein_length,



                             const char ** names,

                             size_t names_length,

                             const size_t * nameLengths,

                             size_t nameLengths_length,

                             const size_t * nameLengths,



                             const uint32_t * arraySizes,

                             size_t arraySizes_length) {

    const Element *e = Element::create(rsc, ein_length, (const Element **)ein, names, nameLengths, arraySizes);

libs/rs/rsFifo.cpp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "rsFifoSocket.h"

#include "utils/Timers.h"

#include "utils/StopWatch.h"



using namespace android;

using namespace android::renderscript;



Fifo::Fifo() {



}



Fifo::~Fifo() {



}