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

Commit 8fa95f96 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 838336fa: am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti" 

Merge commit '838336fa'

* commit '838336fa':
  pixelflinger: Fix function naming typo: gglBitBlti
parents aa3061da 838336fa

include/pixelflinger/pixelflinger.h

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ extern "C" { 
ssize_t gglInit(GGLContext** context);

ssize_t gglUninit(GGLContext* context);



GGLint gglBitBlti(

GGLint gglBitBlit(

        GGLContext* c,

        int tmu,

        GGLint crop[4],

libpixelflinger/raster.cpp

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ void ggl_copyPixels(void* con, GGLint xs, GGLint ys, 


using namespace android;



GGLint gglBitBlti(GGLContext* con, int tmu, GGLint crop[4], GGLint where[4])

GGLint gglBitBlit(GGLContext* con, int tmu, GGLint crop[4], GGLint where[4])

{

    GGL_CONTEXT(c, (void*)con);