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

Commit 1da8a6a3 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Add shader program selection shortcut" into jb-mr2-dev

parents 624de685 096b8d96

libs/hwui/Program.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <SkXfermode.h>



#include "Debug.h"

#include "Matrix.h"

#include "Properties.h"

libs/hwui/ProgramCache.cpp

+6 −0
Original line number Diff line number Diff line
@@ -433,6 +433,12 @@ void ProgramCache::clear() { 


Program* ProgramCache::get(const ProgramDescription& description) {

    programid key = description.key();

    if (key == (PROGRAM_KEY_TEXTURE | PROGRAM_KEY_A8_TEXTURE)) {

        // program for A8, unmodulated, texture w/o shader (black text/path textures) is equivalent

        // to standard texture program (bitmaps, patches). Consider them equivalent.

        key = PROGRAM_KEY_TEXTURE;

    }



    ssize_t index = mCache.indexOfKey(key);

    Program* program = NULL;

    if (index < 0) {

libs/hwui/ProgramCache.h

+0 −11
Original line number Diff line number Diff line
@@ -30,17 +30,6 @@ 
namespace android {

namespace uirenderer {



///////////////////////////////////////////////////////////////////////////////

// Defines

///////////////////////////////////////////////////////////////////////////////



// Debug

#if DEBUG_PROGRAMS

    #define PROGRAM_LOGD(...) ALOGD(__VA_ARGS__)

#else

    #define PROGRAM_LOGD(...)

#endif



///////////////////////////////////////////////////////////////////////////////

// Cache

///////////////////////////////////////////////////////////////////////////////