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

Commit b2a5354f authored by Jason Sams's avatar Jason Sams
Browse files

resolved conflicts for merge of cb66aec0 to graphics-dev 

Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
parents c6253d50 cb66aec0

libs/rs/rsAllocation.h

+1 −2
Original line number Diff line number Diff line
@@ -55,9 +55,8 @@ public: 
            bool hasMipmaps;

            bool hasFaces;

            bool hasReferences;

            int32_t surfaceTextureID;



            void * usrPtr;

            int32_t surfaceTextureID;

        };

        State state;