diff options
| author | Stephen Hines <srhines@google.com> | 2012-04-11 18:09:54 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-04-12 09:20:45 -0700 |
| commit | ae8b795a673b75bf0aec72620f4530db1415f907 (patch) | |
| tree | 69b708612b7062c24037560e27aab77af5248595 | |
| parent | 0dc66936c02f285a242b6a68166d6f03618a0f07 (diff) | |
| download | rs-ae8b795a673b75bf0aec72620f4530db1415f907.tar.gz | |
Add in missing FONT support.
Change-Id: I30854d5466b14a2349893f339dd4d48c29932d94
| -rw-r--r-- | rsComponent.cpp | 4 | ||||
| -rw-r--r-- | rsDefines.h | 1 | ||||
| -rw-r--r-- | scriptc/rs_types.rsh | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/rsComponent.cpp b/rsComponent.cpp index 9c2c2005..d240952b 100644 --- a/rsComponent.cpp +++ b/rsComponent.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -117,6 +117,7 @@ void Component::set(RsDataType dt, RsDataKind dk, bool norm, uint32_t vecSize) { case RS_TYPE_PROGRAM_VERTEX: case RS_TYPE_PROGRAM_RASTER: case RS_TYPE_PROGRAM_STORE: + case RS_TYPE_FONT: rsAssert(mVectorSize == 1); rsAssert(mNormalized == false); rsAssert(mKind == RS_KIND_USER); @@ -170,6 +171,7 @@ void Component::set(RsDataType dt, RsDataKind dk, bool norm, uint32_t vecSize) { break; default: rsAssert(mType != RS_TYPE_INVALID); + rsAssert(0); break; } diff --git a/rsDefines.h b/rsDefines.h index 0e0cd8dd..854df08a 100644 --- a/rsDefines.h +++ b/rsDefines.h @@ -155,6 +155,7 @@ enum RsDataType { RS_TYPE_PROGRAM_VERTEX, RS_TYPE_PROGRAM_RASTER, RS_TYPE_PROGRAM_STORE, + RS_TYPE_FONT, RS_TYPE_INVALID = 10000, }; diff --git a/scriptc/rs_types.rsh b/scriptc/rs_types.rsh index 10617d82..397caaec 100644 --- a/scriptc/rs_types.rsh +++ b/scriptc/rs_types.rsh @@ -471,6 +471,7 @@ typedef enum { RS_TYPE_PROGRAM_VERTEX = 1007, RS_TYPE_PROGRAM_RASTER = 1008, RS_TYPE_PROGRAM_STORE = 1009, + RS_TYPE_FONT = 1010, RS_TYPE_INVALID = 10000, } rs_data_type; |