diff options
44 files changed, 1868 insertions, 738 deletions
diff --git a/api/current.xml b/api/current.xml index bac65eb6afb7..ef3289d86602 100644 --- a/api/current.xml +++ b/api/current.xml @@ -158702,6 +158702,17 @@ visibility="public" > </field> +<field name="ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_INPUT_METHOD_SETTINGS" type="java.lang.String" transient="false" diff --git a/core/java/android/nfc/NdefTagConnection.java b/core/java/android/nfc/NdefTagConnection.java index 321b0eca1685..27fa25c01df0 100644 --- a/core/java/android/nfc/NdefTagConnection.java +++ b/core/java/android/nfc/NdefTagConnection.java @@ -42,8 +42,8 @@ public class NdefTagConnection extends RawTagConnection { * Internal constructor, to be used by NfcAdapter * @hide */ - /* package private */ NdefTagConnection(INfcAdapter service, NdefTag tag, String target) throws RemoteException { - super(service, tag); + /* package private */ NdefTagConnection(NfcAdapter adapter, NdefTag tag, String target) throws RemoteException { + super(adapter, tag); String[] targets = tag.getNdefTargets(); int i; @@ -63,8 +63,8 @@ public class NdefTagConnection extends RawTagConnection { * Internal constructor, to be used by NfcAdapter * @hide */ - /* package private */ NdefTagConnection(INfcAdapter service, NdefTag tag) throws RemoteException { - this(service, tag, tag.getNdefTargets()[0]); + /* package private */ NdefTagConnection(NfcAdapter adapter, NdefTag tag) throws RemoteException { + this(adapter, tag, tag.getNdefTargets()[0]); } /** @@ -97,7 +97,7 @@ public class NdefTagConnection extends RawTagConnection { msgArray[0] = msg; return msgArray; } catch (RemoteException e) { - Log.e(TAG, "NFC service died"); + attemptDeadServiceRecovery(e); return null; } } @@ -134,7 +134,7 @@ public class NdefTagConnection extends RawTagConnection { throw new IOException(); } } catch (RemoteException e) { - Log.e(TAG, "NFC service died"); + attemptDeadServiceRecovery(e); } } @@ -161,7 +161,7 @@ public class NdefTagConnection extends RawTagConnection { throw new IOException(); } } catch (RemoteException e) { - Log.e(TAG, "NFC service died"); + attemptDeadServiceRecovery(e); return false; } } @@ -188,7 +188,7 @@ public class NdefTagConnection extends RawTagConnection { return result; } catch (RemoteException e) { - Log.e(TAG, "NFC service died"); + attemptDeadServiceRecovery(e); return NDEF_MODE_UNKNOWN; } } diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 7f4b4a260ac9..a093d121bcd8 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -168,7 +168,10 @@ public final class NfcAdapter { private static boolean sIsInitialized = false; private static NfcAdapter sAdapter; - private final INfcAdapter mService; + // Final after construction, except for attemptDeadServiceRecovery() + // when NFC crashes. + // Not locked - we accept a best effort attempt when NFC crashes. + /*package*/ INfcAdapter mService; private NfcAdapter(INfcAdapter service) { mService = service; @@ -194,6 +197,16 @@ public final class NfcAdapter { } } + /** get handle to NFC service interface */ + private static synchronized INfcAdapter getServiceInterface() { + /* get a handle to NFC service */ + IBinder b = ServiceManager.getService("nfc"); + if (b == null) { + return null; + } + return INfcAdapter.Stub.asInterface(b); + } + /** * Get a handle to the default NFC Adapter on this Android device. * <p> @@ -214,18 +227,31 @@ public final class NfcAdapter { return null; } - /* get a handle to NFC service */ - IBinder b = ServiceManager.getService("nfc"); - if (b == null) { + INfcAdapter service = getServiceInterface(); + if (service == null) { Log.e(TAG, "could not retrieve NFC service"); return null; } - sAdapter = new NfcAdapter(INfcAdapter.Stub.asInterface(b)); + sAdapter = new NfcAdapter(service); return sAdapter; } } + /** NFC service dead - attempt best effort recovery */ + /*package*/ void attemptDeadServiceRecovery(Exception e) { + Log.e(TAG, "NFC service dead - attempting to recover", e); + INfcAdapter service = getServiceInterface(); + if (service == null) { + Log.e(TAG, "could not retrieve NFC service during service recovery"); + return; + } + /* assigning to mService is not thread-safe, but this is best-effort code + * and on a well-behaved system should never happen */ + mService = service; + return; + } + /** * Return true if this NFC Adapter has any features enabled. * <p> @@ -241,7 +267,7 @@ public final class NfcAdapter { try { return mService.isEnabled(); } catch (RemoteException e) { - Log.e(TAG, "RemoteException in isEnabled()", e); + attemptDeadServiceRecovery(e); return false; } } @@ -258,7 +284,7 @@ public final class NfcAdapter { try { return mService.enable(); } catch (RemoteException e) { - Log.e(TAG, "RemoteException in enable()", e); + attemptDeadServiceRecovery(e); return false; } } @@ -277,7 +303,7 @@ public final class NfcAdapter { try { return mService.disable(); } catch (RemoteException e) { - Log.e(TAG, "RemoteException in disable()", e); + attemptDeadServiceRecovery(e); return false; } } @@ -303,7 +329,7 @@ public final class NfcAdapter { try { mService.localSet(message); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); } } @@ -317,7 +343,7 @@ public final class NfcAdapter { try { return mService.localGet(); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); return null; } } @@ -331,9 +357,9 @@ public final class NfcAdapter { throw new IllegalArgumentException("mock tag cannot be used for connections"); } try { - return new RawTagConnection(mService, tag); + return new RawTagConnection(this, tag); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); return null; } } @@ -347,9 +373,9 @@ public final class NfcAdapter { throw new IllegalArgumentException("mock tag cannot be used for connections"); } try { - return new RawTagConnection(mService, tag, target); + return new RawTagConnection(this, tag, target); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); return null; } } @@ -363,9 +389,9 @@ public final class NfcAdapter { throw new IllegalArgumentException("mock tag cannot be used for connections"); } try { - return new NdefTagConnection(mService, tag); + return new NdefTagConnection(this, tag); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); return null; } } @@ -379,9 +405,9 @@ public final class NfcAdapter { throw new IllegalArgumentException("mock tag cannot be used for connections"); } try { - return new NdefTagConnection(mService, tag, target); + return new NdefTagConnection(this, tag, target); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); return null; } } diff --git a/core/java/android/nfc/RawTagConnection.java b/core/java/android/nfc/RawTagConnection.java index 844289360b2e..24072e5341a1 100644 --- a/core/java/android/nfc/RawTagConnection.java +++ b/core/java/android/nfc/RawTagConnection.java @@ -35,15 +35,20 @@ import android.util.Log; */ public class RawTagConnection { - /*package*/ final INfcAdapter mService; - /*package*/ final INfcTag mTagService; /*package*/ final Tag mTag; /*package*/ boolean mIsConnected; /*package*/ String mSelectedTarget; + private final NfcAdapter mAdapter; + + // Following fields are final after construction, except for + // during attemptDeadServiceRecovery() when NFC crashes. + // Not locked - we accept a best effort attempt when NFC crashes. + /*package*/ INfcAdapter mService; + /*package*/ INfcTag mTagService; private static final String TAG = "NFC"; - /* package private */ RawTagConnection(INfcAdapter service, Tag tag, String target) throws RemoteException { + /*package*/ RawTagConnection(NfcAdapter adapter, Tag tag, String target) throws RemoteException { String[] targets = tag.getRawTargets(); int i; @@ -58,14 +63,28 @@ public class RawTagConnection { throw new IllegalArgumentException(); } - mService = service; - mTagService = service.getNfcTagInterface(); + mAdapter = adapter; + mService = mAdapter.mService; + mTagService = mService.getNfcTagInterface(); mTag = tag; mSelectedTarget = target; } - /* package private */ RawTagConnection(INfcAdapter service, Tag tag) throws RemoteException { - this(service, tag, tag.getRawTargets()[0]); + /*package*/ RawTagConnection(NfcAdapter adapter, Tag tag) throws RemoteException { + this(adapter, tag, tag.getRawTargets()[0]); + } + + /** NFC service dead - attempt best effort recovery */ + /*package*/ void attemptDeadServiceRecovery(Exception e) { + mAdapter.attemptDeadServiceRecovery(e); + /* assigning to mService is not thread-safe, but this is best-effort code + * and on a well-behaved system should never happen */ + mService = mAdapter.mService; + try { + mTagService = mService.getNfcTagInterface(); + } catch (RemoteException e2) { + Log.e(TAG, "second RemoteException trying to recover from dead NFC service", e2); + } } /** @@ -101,7 +120,7 @@ public class RawTagConnection { try { return mTagService.isPresent(mTag.mServiceHandle); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); return false; } } @@ -136,7 +155,7 @@ public class RawTagConnection { try { mTagService.close(mTag.mServiceHandle); } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); } } @@ -159,7 +178,7 @@ public class RawTagConnection { } return response; } catch (RemoteException e) { - Log.e(TAG, "NFC service died", e); + attemptDeadServiceRecovery(e); throw new IOException("NFC service died"); } } diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index 7629c318ee1c..33f37f8f1a61 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -151,7 +151,7 @@ public abstract class PreferenceFragment extends Fragment implements @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(com.android.internal.R.layout.preference_list_content, + return inflater.inflate(com.android.internal.R.layout.preference_list_fragment, container, false); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 62d2ff2d81f7..2b79037e1491 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -279,6 +279,20 @@ public final class Settings { "android.settings.INPUT_METHOD_SETTINGS"; /** + * Activity Action: Show enabler activity to enable/disable input methods and subtypes. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER = + "android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"; + + /** * Activity Action: Show settings to manage the user input dictionary. * <p> * In some cases, a matching Activity may not exist, so ensure you diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 6e588b9f23ab..2087664b3eb4 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -74,8 +74,6 @@ class BrowserFrame extends Handler { // queue has been cleared,they are ignored. private boolean mBlockMessages = false; private int mOrientation = -1; - private static String sDatabaseDirectory; - private static String sCacheDirectory; // Is this frame the main frame? private boolean mIsMainFrame; @@ -229,13 +227,6 @@ class BrowserFrame extends Handler { AssetManager am = context.getAssets(); nativeCreateFrame(w, am, proxy.getBackForwardList()); - if (sDatabaseDirectory == null) { - sDatabaseDirectory = appContext.getDatabasePath("dummy").getParent(); - } - if (sCacheDirectory == null) { - sCacheDirectory = appContext.getCacheDir().getAbsolutePath(); - } - if (DebugFlags.BROWSER_FRAME) { Log.v(LOGTAG, "BrowserFrame constructor: this=" + this); } @@ -658,22 +649,6 @@ class BrowserFrame extends Handler { } /** - * Called by JNI. Gets the application's database directory, excluding the trailing slash. - * @return String The application's database directory - */ - private static String getDatabaseDirectory() { - return sDatabaseDirectory; - } - - /** - * Called by JNI. Gets the application's cache directory, excluding the trailing slash. - * @return String The application's cache directory - */ - private static String getCacheDirectory() { - return sCacheDirectory; - } - - /** * Called by JNI. * Read from an InputStream into a supplied byte[] * This method catches any exceptions so they don't crash the JVM. @@ -752,6 +727,14 @@ class BrowserFrame extends Handler { } } else if (type == CONTENT) { try { + // Strip off mimetype, for compatibility with ContentLoader.java + // If we don't do this, we can fail to load Gmail attachments, + // because the URL being loaded doesn't exactly match the URL we + // have permission to read. + int mimeIndex = url.lastIndexOf('?'); + if (mimeIndex != -1) { + url = url.substring(0, mimeIndex); + } Uri uri = Uri.parse(url); return mContext.getContentResolver().openInputStream(uri); } catch (Exception e) { diff --git a/core/java/android/webkit/CookieSyncManager.java b/core/java/android/webkit/CookieSyncManager.java index abe91789b6e6..8b76a3bf4b0c 100644 --- a/core/java/android/webkit/CookieSyncManager.java +++ b/core/java/android/webkit/CookieSyncManager.java @@ -65,6 +65,11 @@ public final class CookieSyncManager extends WebSyncManager { // time when last update happened private long mLastUpdate; + // Used by the Chromium HTTP stack. Everything else in this class is used only by the Android + // Java HTTP stack. + private static String sDatabaseDirectory; + private static String sCacheDirectory; + private CookieSyncManager(Context context) { super(context, "CookieSyncManager"); } @@ -77,11 +82,7 @@ public final class CookieSyncManager extends WebSyncManager { * @return CookieSyncManager */ public static synchronized CookieSyncManager getInstance() { - if (sRef == null) { - throw new IllegalStateException( - "CookieSyncManager::createInstance() needs to be called " - + "before CookieSyncManager::getInstance()"); - } + checkInstanceIsCreated(); return sRef; } @@ -92,8 +93,11 @@ public final class CookieSyncManager extends WebSyncManager { */ public static synchronized CookieSyncManager createInstance( Context context) { + Context appContext = context.getApplicationContext(); if (sRef == null) { - sRef = new CookieSyncManager(context.getApplicationContext()); + sRef = new CookieSyncManager(appContext); + sDatabaseDirectory = appContext.getDatabasePath("dummy").getParent(); + sCacheDirectory = appContext.getCacheDir().getAbsolutePath(); } return sRef; } @@ -210,4 +214,30 @@ public final class CookieSyncManager extends WebSyncManager { } } } + + private static void checkInstanceIsCreated() { + if (sRef == null) { + throw new IllegalStateException( + "CookieSyncManager::createInstance() needs to be called " + + "before CookieSyncManager::getInstance()"); + } + } + + /** + * Called by JNI. Gets the application's database directory, excluding the trailing slash. + * @return String The application's database directory + */ + private static synchronized String getDatabaseDirectory() { + checkInstanceIsCreated(); + return sDatabaseDirectory; + } + + /** + * Called by JNI. Gets the application's cache directory, excluding the trailing slash. + * @return String The application's cache directory + */ + private static synchronized String getCacheDirectory() { + checkInstanceIsCreated(); + return sCacheDirectory; + } } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 908a6ab69cdd..68fa5c38522a 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -6047,7 +6047,7 @@ public class WebView extends AbsoluteLayout } private void doMotionUp(int contentX, int contentY) { - if (mLogEvent && nativeMotionUp(contentX, contentY, mNavSlop)) { + if (nativeMotionUp(contentX, contentY, mNavSlop) && mLogEvent) { EventLog.writeEvent(EventLogTags.BROWSER_SNAP_CENTER); } if (nativeHasCursorNode() && !nativeCursorIsTextInput()) { diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 1c8e2cd9585b..cd6c81e4c993 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -260,9 +260,11 @@ final class WebViewCore { * Given mimeType, check whether it's supported in Android media framework. * mimeType could be such as "audio/ogg" and "video/mp4". */ - /* package */ static boolean supportsMimeType(String mimeType) { - return MediaFile.getFileTypeForMimeType(mimeType) > 0; + /* package */ static boolean isSupportedMediaMimeType(String mimeType) { + int fileType = MediaFile.getFileTypeForMimeType(mimeType); + return MediaFile.isAudioFileType(fileType) || MediaFile.isVideoFileType(fileType); } + /** * Add an error message to the client's console. * @param message The message to add diff --git a/core/java/com/android/internal/view/InputMethodAndSubtypeEnabler.java b/core/java/com/android/internal/view/InputMethodAndSubtypeEnabler.java deleted file mode 100644 index 200d49fe4350..000000000000 --- a/core/java/com/android/internal/view/InputMethodAndSubtypeEnabler.java +++ /dev/null @@ -1,319 +0,0 @@ -/* - * Copyright (C) 2010 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. - */ - -package com.android.internal.view; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.content.res.Configuration; -import android.os.Bundle; -import android.preference.CheckBoxPreference; -import android.preference.Preference; -import android.preference.PreferenceActivity; -import android.preference.PreferenceCategory; -import android.preference.PreferenceScreen; -import android.provider.Settings; -import android.text.TextUtils; -import android.view.inputmethod.InputMethodInfo; -import android.view.inputmethod.InputMethodManager; -import android.view.inputmethod.InputMethodSubtype; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -public class InputMethodAndSubtypeEnabler extends PreferenceActivity { - - private boolean mHaveHardKeyboard; - - private List<InputMethodInfo> mInputMethodProperties; - - private final TextUtils.SimpleStringSplitter mStringColonSplitter - = new TextUtils.SimpleStringSplitter(':'); - - private String mLastInputMethodId; - private String mLastTickedInputMethodId; - - private AlertDialog mDialog = null; - - @Override - protected void onCreate(Bundle icicle) { - super.onCreate(icicle); - Configuration config = getResources().getConfiguration(); - mHaveHardKeyboard = (config.keyboard == Configuration.KEYBOARD_QWERTY); - onCreateIMM(); - setPreferenceScreen(createPreferenceHierarchy()); - } - - @Override - protected void onResume() { - super.onResume(); - loadInputMethodSubtypeList(); - } - - @Override - protected void onPause() { - super.onPause(); - saveInputMethodSubtypeList(); - } - - @Override - public boolean onPreferenceTreeClick( - PreferenceScreen preferenceScreen, Preference preference) { - - if (preference instanceof CheckBoxPreference) { - final CheckBoxPreference chkPref = (CheckBoxPreference) preference; - final String id = chkPref.getKey(); - // TODO: Check subtype or not here - if (chkPref.isChecked()) { - InputMethodInfo selImi = null; - final int N = mInputMethodProperties.size(); - for (int i = 0; i < N; i++) { - InputMethodInfo imi = mInputMethodProperties.get(i); - if (id.equals(imi.getId())) { - selImi = imi; - if (isSystemIme(imi)) { - setSubtypesPreferenceEnabled(id, true); - // This is a built-in IME, so no need to warn. - mLastTickedInputMethodId = id; - return super.onPreferenceTreeClick(preferenceScreen, preference); - } - break; - } - } - if (selImi == null) { - return super.onPreferenceTreeClick(preferenceScreen, preference); - } - chkPref.setChecked(false); - if (mDialog == null) { - mDialog = (new AlertDialog.Builder(this)) - .setTitle(android.R.string.dialog_alert_title) - .setIcon(android.R.drawable.ic_dialog_alert) - .setCancelable(true) - .setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - chkPref.setChecked(true); - setSubtypesPreferenceEnabled(id, true); - mLastTickedInputMethodId = id; - } - - }) - .setNegativeButton(android.R.string.cancel, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - } - - }) - .create(); - } else { - if (mDialog.isShowing()) { - mDialog.dismiss(); - } - } - mDialog.setMessage(getResources().getString( - com.android.internal.R.string.ime_enabler_security_warning, - selImi.getServiceInfo().applicationInfo.loadLabel(getPackageManager()))); - mDialog.show(); - } else { - if (id.equals(mLastTickedInputMethodId)) { - mLastTickedInputMethodId = null; - } - setSubtypesPreferenceEnabled(id, false); - } - } - return super.onPreferenceTreeClick(preferenceScreen, preference); - } - - @Override - public void onDestroy() { - super.onDestroy(); - if (mDialog != null) { - mDialog.dismiss(); - mDialog = null; - } - } - - private void onCreateIMM() { - InputMethodManager imm = (InputMethodManager) getSystemService( - Context.INPUT_METHOD_SERVICE); - - // TODO: Change mInputMethodProperties to Map - mInputMethodProperties = imm.getInputMethodList(); - - mLastInputMethodId = Settings.Secure.getString(getContentResolver(), - Settings.Secure.DEFAULT_INPUT_METHOD); - } - - private PreferenceScreen createPreferenceHierarchy() { - // Root - PreferenceScreen root = getPreferenceManager().createPreferenceScreen(this); - - int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties.size()); - // TODO: Use iterator. - for (int i = 0; i < N; ++i) { - PreferenceCategory keyboardSettingsCategory = new PreferenceCategory(this); - root.addPreference(keyboardSettingsCategory); - InputMethodInfo property = mInputMethodProperties.get(i); - String prefKey = property.getId(); - - PackageManager pm = getPackageManager(); - CharSequence label = property.loadLabel(pm); - boolean systemIME = isSystemIme(property); - - keyboardSettingsCategory.setTitle(label); - - // Add a check box. - // Don't show the toggle if it's the only keyboard in the system, or it's a system IME. - if (mHaveHardKeyboard || (N > 1 && !systemIME)) { - CheckBoxPreference chkbxPref = new CheckBoxPreference(this); - chkbxPref.setKey(prefKey); - chkbxPref.setTitle(label); - keyboardSettingsCategory.addPreference(chkbxPref); - } - - ArrayList<InputMethodSubtype> subtypes = property.getSubtypes(); - if (subtypes.size() > 0) { - PreferenceCategory subtypesCategory = new PreferenceCategory(this); - subtypesCategory.setTitle(getResources().getString( - com.android.internal.R.string.ime_enabler_subtype_title, label)); - root.addPreference(subtypesCategory); - for (InputMethodSubtype subtype: subtypes) { - CharSequence subtypeLabel; - int nameResId = subtype.getNameResId(); - if (nameResId != 0) { - subtypeLabel = pm.getText(property.getPackageName(), nameResId, - property.getServiceInfo().applicationInfo); - } else { - int modeResId = subtype.getModeResId(); - CharSequence language = subtype.getLocale(); - CharSequence mode = modeResId == 0 ? null - : pm.getText(property.getPackageName(), modeResId, - property.getServiceInfo().applicationInfo); - // TODO: Use more friendly Title and UI - subtypeLabel = (mode == null ? "" : mode) + "," - + (language == null ? "" : language); - } - CheckBoxPreference chkbxPref = new CheckBoxPreference(this); - chkbxPref.setKey(prefKey + subtype.hashCode()); - chkbxPref.setTitle(subtypeLabel); - chkbxPref.setSummary(label); - subtypesCategory.addPreference(chkbxPref); - } - } - } - return root; - } - - private void loadInputMethodSubtypeList() { - final HashSet<String> enabled = new HashSet<String>(); - String enabledStr = Settings.Secure.getString(getContentResolver(), - Settings.Secure.ENABLED_INPUT_METHODS); - if (enabledStr != null) { - final TextUtils.SimpleStringSplitter splitter = mStringColonSplitter; - splitter.setString(enabledStr); - while (splitter.hasNext()) { - enabled.add(splitter.next()); - } - } - - // Update the statuses of the Check Boxes. - int N = mInputMethodProperties.size(); - // TODO: Use iterator. - for (int i = 0; i < N; ++i) { - final String id = mInputMethodProperties.get(i).getId(); - CheckBoxPreference pref = (CheckBoxPreference) findPreference( - mInputMethodProperties.get(i).getId()); - if (pref != null) { - boolean isEnabled = enabled.contains(id); - pref.setChecked(isEnabled); - setSubtypesPreferenceEnabled(id, isEnabled); - } - } - mLastTickedInputMethodId = null; - } - - private void saveInputMethodSubtypeList() { - StringBuilder builder = new StringBuilder(); - StringBuilder disabledSysImes = new StringBuilder(); - - int firstEnabled = -1; - int N = mInputMethodProperties.size(); - for (int i = 0; i < N; ++i) { - final InputMethodInfo property = mInputMethodProperties.get(i); - final String id = property.getId(); - CheckBoxPreference pref = (CheckBoxPreference) findPreference(id); - boolean currentInputMethod = id.equals(mLastInputMethodId); - boolean systemIme = isSystemIme(property); - // TODO: Append subtypes by using the separator ";" - if (((N == 1 || systemIme) && !mHaveHardKeyboard) - || (pref != null && pref.isChecked())) { - if (builder.length() > 0) builder.append(':'); - builder.append(id); - if (firstEnabled < 0) { - firstEnabled = i; - } - } else if (currentInputMethod) { - mLastInputMethodId = mLastTickedInputMethodId; - } - // If it's a disabled system ime, add it to the disabled list so that it - // doesn't get enabled automatically on any changes to the package list - if (pref != null && !pref.isChecked() && systemIme && mHaveHardKeyboard) { - if (disabledSysImes.length() > 0) disabledSysImes.append(":"); - disabledSysImes.append(id); - } - } - - // If the last input method is unset, set it as the first enabled one. - if (TextUtils.isEmpty(mLastInputMethodId)) { - if (firstEnabled >= 0) { - mLastInputMethodId = mInputMethodProperties.get(firstEnabled).getId(); - } else { - mLastInputMethodId = null; - } - } - - Settings.Secure.putString(getContentResolver(), - Settings.Secure.ENABLED_INPUT_METHODS, builder.toString()); - Settings.Secure.putString(getContentResolver(), - Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS, disabledSysImes.toString()); - Settings.Secure.putString(getContentResolver(), - Settings.Secure.DEFAULT_INPUT_METHOD, - mLastInputMethodId != null ? mLastInputMethodId : ""); - } - - private void setSubtypesPreferenceEnabled(String id, boolean enabled) { - PreferenceScreen preferenceScreen = getPreferenceScreen(); - final int N = mInputMethodProperties.size(); - // TODO: Use iterator. - for (int i = 0; i < N; i++) { - InputMethodInfo imi = mInputMethodProperties.get(i); - if (id.equals(imi.getId())) { - for (InputMethodSubtype subtype: imi.getSubtypes()) { - preferenceScreen.findPreference(id + subtype.hashCode()).setEnabled(enabled); - } - } - } - } - - private boolean isSystemIme(InputMethodInfo property) { - return (property.getServiceInfo().applicationInfo.flags - & ApplicationInfo.FLAG_SYSTEM) != 0; - } -} diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 122fdf8b7757..22a80f555b50 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1352,11 +1352,6 @@ android:permission="android.permission.BIND_WALLPAPER"> </service> - <activity android:name="com.android.internal.view.InputMethodAndSubtypeEnabler" - android:excludeFromRecents="true" - android:exported="true"> - </activity> - <receiver android:name="com.android.server.BootReceiver" > <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> diff --git a/core/res/res/layout-port/preference_header_item.xml b/core/res/res/layout-port/preference_header_item.xml deleted file mode 100644 index cc76c8e3c17a..000000000000 --- a/core/res/res/layout-port/preference_header_item.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 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. ---> - -<!-- Layout of a header item in PreferenceActivity. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="96dp" - android:background="?android:attr/activatedBackgroundIndicator" - android:paddingRight="?android:attr/scrollbarSize"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_gravity="center" - android:paddingLeft="4dip" - android:paddingRight="4dip" - android:paddingTop="4dip" - android:paddingBottom="4dip"> - - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginBottom="2dip" /> - - <TextView android:id="@+android:id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginBottom="2dip" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceLarge" - android:ellipsize="marquee" - android:fadingEdge="horizontal" /> - - <TextView android:id="@+android:id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" - android:textAppearance="?android:attr/textAppearanceSmall" - android:ellipsize="end" - android:maxLines="2" /> - - </LinearLayout> -</FrameLayout> diff --git a/core/res/res/layout/preference_header_item.xml b/core/res/res/layout/preference_header_item.xml index aba7b2ad0a5a..f00e7aa59d29 100644 --- a/core/res/res/layout/preference_header_item.xml +++ b/core/res/res/layout/preference_header_item.xml @@ -18,7 +18,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" + android:minHeight="48dp" android:background="?android:attr/activatedBackgroundIndicator" android:gravity="center_vertical" android:paddingRight="?android:attr/scrollbarSize"> diff --git a/core/res/res/layout/preference_list_content.xml b/core/res/res/layout/preference_list_content.xml index 7c0b79140ae1..5b4240747543 100644 --- a/core/res/res/layout/preference_list_content.xml +++ b/core/res/res/layout/preference_list_content.xml @@ -21,7 +21,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_height="match_parent" - android:layout_width="match_parent"> + android:layout_width="match_parent" + android:background="@android:color/transparent"> <LinearLayout android:orientation="horizontal" @@ -34,6 +35,10 @@ android:orientation="vertical" android:layout_width="0px" android:layout_height="match_parent" + android:layout_marginLeft="32dp" + android:layout_marginTop="32dp" + android:layout_marginRight="16dp" + android:layout_marginBottom="32dp" android:layout_weight="10"> <ListView android:id="@android:id/list" @@ -41,6 +46,9 @@ android:layout_height="0px" android:layout_weight="1" android:drawSelectorOnTop="false" + android:background="#40404040" + android:cacheColorHint="@android:color/transparent" + android:listPreferredItemHeight="48dp" android:scrollbarAlwaysDrawVerticalTrack="true" /> <FrameLayout android:id="@+id/list_footer" @@ -53,7 +61,12 @@ <FrameLayout android:id="@+id/prefs" android:layout_width="0px" android:layout_height="match_parent" - android:layout_weight="33" + android:layout_weight="25" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:background="#60202040" android:visibility="gone" /> </LinearLayout> diff --git a/core/res/res/layout/preference_list_fragment.xml b/core/res/res/layout/preference_list_fragment.xml new file mode 100644 index 000000000000..c499b8a0a57c --- /dev/null +++ b/core/res/res/layout/preference_list_fragment.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2010, 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. +*/ +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:background="@android:color/transparent"> + + <ListView android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1" + android:drawSelectorOnTop="false" + android:cacheColorHint="@android:color/transparent" + android:scrollbarAlwaysDrawVerticalTrack="true" /> + + <RelativeLayout android:id="@+id/button_bar" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_weight="0" + android:background="@android:drawable/bottom_bar" + android:visibility="gone"> + + <Button android:id="@+id/back_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:layout_alignParentLeft="true" + android:drawableLeft="@drawable/ic_btn_back" + android:drawablePadding="3dip" + android:text="@string/back_button_label" + /> + <LinearLayout + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true"> + + <Button android:id="@+id/skip_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:text="@string/skip_button_label" + android:visibility="gone" + /> + + <Button android:id="@+id/next_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:drawableRight="@drawable/ic_btn_next" + android:drawablePadding="3dip" + android:text="@string/next_button_label" + /> + </LinearLayout> + </RelativeLayout> +</LinearLayout> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 749b3c74520e..061fa4fba1b9 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2379,11 +2379,6 @@ <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> of <xliff:g id="total" example="137">%d</xliff:g></item> </plurals> - <!-- Warning message about security implications of enabling an input method, displayed as a dialog message when the user selects to enable an IME. --> - <string name="ime_enabler_security_warning">This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the application <xliff:g id="ime_application_name">%1$s</xliff:g>. Use this input method?</string> - <!-- Label for selecting the input method to use --> - <string name="ime_enabler_subtype_title">Select inputmethods in <xliff:g id="ime_application_name">%1$s</xliff:g></string> - <!-- Label for the "Done" button on the far left of action mode toolbars. --> <string name="action_mode_done">Done</string> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 76a3c34abb22..61167b58fd0f 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -408,7 +408,7 @@ <style name="Widget.TextView.ListSeparator"> <item name="android:background">@android:drawable/dark_header_dither</item> <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">25dip</item> + <item name="android:layout_height">wrap_content</item> <item name="android:textStyle">bold</item> <item name="android:textColor">?textColorSecondary</item> <item name="android:textSize">14sp</item> diff --git a/libs/binder/CursorWindow.cpp b/libs/binder/CursorWindow.cpp index bdd4dd6505cd..fbba28104a42 100644 --- a/libs/binder/CursorWindow.cpp +++ b/libs/binder/CursorWindow.cpp @@ -115,7 +115,7 @@ field_slot_t * CursorWindow::allocRow() uint32_t fieldDirOffset = alloc(fieldDirSize); if (!fieldDirOffset) { mHeader->numRows--; - LOGE("The row failed, so back out the new row accounting from allocRowSlot %d", mHeader->numRows); + LOG_WINDOW("The row failed, so back out the new row accounting from allocRowSlot %d", mHeader->numRows); return NULL; } field_slot_t * fieldDir = (field_slot_t *)offsetToPtr(fieldDirOffset); diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 66a93f04518e..381b77a2c8cd 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -229,6 +229,12 @@ public class MediaFile { return sFileTypeMap.get(path.substring(lastDot + 1).toUpperCase()); } + public static boolean isMimeTypeMedia(String mimeType) { + int fileType = getFileTypeForMimeType(mimeType); + return isAudioFileType(fileType) || isVideoFileType(fileType) + || isImageFileType(fileType) || isPlayListFileType(fileType); + } + // generates a title based on file name public static String getFileTitle(String path) { // extract file name after last slash diff --git a/media/java/android/media/videoeditor/AudioTrack.java b/media/java/android/media/videoeditor/AudioTrack.java index 6303b9d72d51..573208a8a30f 100755 --- a/media/java/android/media/videoeditor/AudioTrack.java +++ b/media/java/android/media/videoeditor/AudioTrack.java @@ -48,6 +48,8 @@ public class AudioTrack { // The audio waveform filename
private String mAudioWaveformFilename;
+ // The audio waveform data
+ private WaveformData mWaveformData;
/**
* An object of this type cannot be instantiated by using the default
@@ -103,6 +105,7 @@ public class AudioTrack { // The audio waveform file is generated later
mAudioWaveformFilename = null;
+ mWaveformData = null;
}
/**
@@ -161,6 +164,11 @@ public class AudioTrack { mDuckedTrackVolume = duckedTrackVolume;
mAudioWaveformFilename = audioWaveformFilename;
+ if (audioWaveformFilename != null) {
+ mWaveformData = new WaveformData(audioWaveformFilename);
+ } else {
+ mWaveformData = null;
+ }
}
/**
@@ -416,6 +424,7 @@ public class AudioTrack { throws IOException {
// TODO: Set mAudioWaveformFilename at the end once the extract is
// complete
+ mWaveformData = new WaveformData(mAudioWaveformFilename);
}
/**
@@ -431,10 +440,17 @@ public class AudioTrack { *
* @return the name of the file, null if the file does not exist
*/
- public String getAudioWaveformFilename() {
+ String getAudioWaveformFilename() {
return mAudioWaveformFilename;
}
+ /**
+ * @return The waveform data
+ */
+ public WaveformData getWaveformData() {
+ return mWaveformData;
+ }
+
/*
* {@inheritDoc}
*/
diff --git a/media/java/android/media/videoeditor/MediaVideoItem.java b/media/java/android/media/videoeditor/MediaVideoItem.java index 341bf8e2b0e4..f09219d9bcff 100755 --- a/media/java/android/media/videoeditor/MediaVideoItem.java +++ b/media/java/android/media/videoeditor/MediaVideoItem.java @@ -46,6 +46,8 @@ public class MediaVideoItem extends MediaItem { private int mVolumePercentage;
private boolean mMuted;
private String mAudioWaveformFilename;
+ // The audio waveform data
+ private WaveformData mWaveformData;
/**
* An object of this type cannot be instantiated with a default constructor
@@ -115,6 +117,11 @@ public class MediaVideoItem extends MediaItem { mVolumePercentage = volumePercent;
mMuted = muted;
mAudioWaveformFilename = audioWaveformFilename;
+ if (audioWaveformFilename != null) {
+ mWaveformData = new WaveformData(audioWaveformFilename);
+ } else {
+ mWaveformData = null;
+ }
}
/**
@@ -286,6 +293,7 @@ public class MediaVideoItem extends MediaItem { public void extractAudioWaveform(ExtractAudioWaveformProgressListener listener)
throws IOException {
// TODO: Set mAudioWaveformFilename at the end once the export is complete
+ mWaveformData = new WaveformData(mAudioWaveformFilename);
}
/**
@@ -299,11 +307,18 @@ public class MediaVideoItem extends MediaItem { * @return the name of the file, null if the file has not been computed or
* if there is no Audio track in the mediaItem
*/
- public String getAudioWaveformFilename() {
+ String getAudioWaveformFilename() {
return mAudioWaveformFilename;
}
/**
+ * @return The waveform data
+ */
+ public WaveformData getWaveformData() {
+ return mWaveformData;
+ }
+
+ /**
* Set volume of the Audio track of this mediaItem
*
* @param volumePercent in %/. 100% means no change; 50% means half value, 200%
diff --git a/media/java/android/media/videoeditor/TransitionEndCurtainClosing.java b/media/java/android/media/videoeditor/TransitionEndCurtainClosing.java deleted file mode 100644 index b1c6bb5262d4..000000000000 --- a/media/java/android/media/videoeditor/TransitionEndCurtainClosing.java +++ /dev/null @@ -1,54 +0,0 @@ -/*
- * Copyright (C) 2010 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.
- */
-
-package android.media.videoeditor;
-
-/**
- * This transition fades to black frame using curtain closing: A black image is
- * moved from top to bottom to cover the video. This transition is always
- * applied at the end of the movie. {@hide}
- */
-public class TransitionEndCurtainClosing extends Transition {
- /**
- * An object of this type cannot be instantiated by using the default
- * constructor
- */
- @SuppressWarnings("unused")
- private TransitionEndCurtainClosing() {
- this(null, null, 0, BEHAVIOR_LINEAR);
- }
-
- /**
- * Constructor.
- *
- * @param transitionId The transition id
- * @param afterMediaItem The transition is applied to the end of this
- * media item
- * @param durationMs duration of the transition in milliseconds
- * @param behavior The transition behavior
- */
- public TransitionEndCurtainClosing(String transitionId, MediaItem afterMediaItem,
- long duration, int behavior) {
- super(transitionId, afterMediaItem, null, duration, behavior);
- }
-
- /*
- * {@inheritDoc}
- */
- @Override
- void generate() {
- }
-}
diff --git a/media/java/android/media/videoeditor/TransitionEndFadeToBlack.java b/media/java/android/media/videoeditor/TransitionEndFadeToBlack.java deleted file mode 100755 index 5f913fced493..000000000000 --- a/media/java/android/media/videoeditor/TransitionEndFadeToBlack.java +++ /dev/null @@ -1,54 +0,0 @@ -/*
- * Copyright (C) 2010 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.
- */
-
-package android.media.videoeditor;
-
-/**
- * This transition fades to black frame using fade out in a certain provided
- * duration. This transition is always applied at the end of the movie. {@hide
- * }
- */
-public class TransitionEndFadeToBlack extends Transition {
- /**
- * An object of this type cannot be instantiated by using the default
- * constructor
- */
- @SuppressWarnings("unused")
- private TransitionEndFadeToBlack() {
- this(null, null, 0, BEHAVIOR_LINEAR);
- }
-
- /**
- * Constructor.
- *
- * @param transitionId The transition id
- * @param afterMediaItem The transition is applied to the end of this
- * media item
- * @param durationMs duration of the transition in milliseconds
- * @param behavior The transition behavior
- */
- public TransitionEndFadeToBlack(String transitionId, MediaItem afterMediaItem, long duration,
- int behavior) {
- super(transitionId, afterMediaItem, null, duration, behavior);
- }
-
- /*
- * {@inheritDoc}
- */
- @Override
- void generate() {
- }
-}
diff --git a/media/java/android/media/videoeditor/TransitionFadeToBlack.java b/media/java/android/media/videoeditor/TransitionFadeBlack.java index 9569a65a3465..a9bf4cec06fd 100755 --- a/media/java/android/media/videoeditor/TransitionFadeToBlack.java +++ b/media/java/android/media/videoeditor/TransitionFadeBlack.java @@ -18,16 +18,17 @@ package android.media.videoeditor; /**
- * This class is used to render a fade to black transition between two videos.
+ * This class is used to render a fade to black and fade from black transition
+ * between two media items.
* {@hide}
*/
-public class TransitionFadeToBlack extends Transition {
+public class TransitionFadeBlack extends Transition {
/**
* An object of this type cannot be instantiated by using the default
* constructor
*/
@SuppressWarnings("unused")
- private TransitionFadeToBlack() {
+ private TransitionFadeBlack() {
this(null, null, null, 0, 0);
}
@@ -45,7 +46,7 @@ public class TransitionFadeToBlack extends Transition { *
* @throws IllegalArgumentException if behavior is not supported.
*/
- public TransitionFadeToBlack(String transitionId, MediaItem afterMediaItem,
+ public TransitionFadeBlack(String transitionId, MediaItem afterMediaItem,
MediaItem beforeMediaItem, long durationMs, int behavior) {
super(transitionId, afterMediaItem, beforeMediaItem, durationMs, behavior);
}
diff --git a/media/java/android/media/videoeditor/TransitionStartCurtainOpening.java b/media/java/android/media/videoeditor/TransitionStartCurtainOpening.java deleted file mode 100755 index b787b32b2c79..000000000000 --- a/media/java/android/media/videoeditor/TransitionStartCurtainOpening.java +++ /dev/null @@ -1,56 +0,0 @@ -/*
- * Copyright (C) 2010 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.
- */
-
-package android.media.videoeditor;
-
-
-/**
- * This transition fades from black frame using curtain opening. A black
- * image is displayed and moves from bottom to top making the video visible.
- * This transition is always applied at the beginning of the movie.
- * {@hide}
- */
-public class TransitionStartCurtainOpening extends Transition {
- /**
- * An object of this type cannot be instantiated by using the default
- * constructor
- */
- @SuppressWarnings("unused")
- private TransitionStartCurtainOpening() {
- this(null, null, 0, Transition.BEHAVIOR_LINEAR);
- }
-
- /**
- * Constructor
- *
- * @param transitionId The transition id
- * @param beforeMediaItem The transition is applied to the beginning of
- * this media item
- * @param durationMs The duration of the transition in milliseconds
- * @param behavior The transition behavior
- */
- public TransitionStartCurtainOpening(String transitionId, MediaItem beforeMediaItem,
- long durationMs, int behavior) {
- super(transitionId, null, beforeMediaItem, durationMs, behavior);
- }
-
- /*
- * {@inheritDoc}
- */
- @Override
- public void generate() {
- }
-}
diff --git a/media/java/android/media/videoeditor/TransitionStartFadeFromBlack.java b/media/java/android/media/videoeditor/TransitionStartFadeFromBlack.java deleted file mode 100644 index be993a510fa6..000000000000 --- a/media/java/android/media/videoeditor/TransitionStartFadeFromBlack.java +++ /dev/null @@ -1,54 +0,0 @@ -/*
- * Copyright (C) 2010 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.
- */
-
-package android.media.videoeditor;
-
-/**
- * This transition fades from black using fade-in in a certain provided
- * duration. This transition is always applied at the beginning of the movie.
- * {@hide}
- */
-public class TransitionStartFadeFromBlack extends Transition {
- /**
- * An object of this type cannot be instantiated by using the default
- * constructor
- */
- @SuppressWarnings("unused")
- private TransitionStartFadeFromBlack() {
- this(null, null, 0, Transition.BEHAVIOR_LINEAR);
- }
-
- /**
- * Constructor
- *
- * @param transitionId The transition id
- * @param beforeMediaItem The transition is applied to the beginning of
- * this media item
- * @param durationMs The duration of the transition in milliseconds
- * @param behavior The transition behavior
- */
- public TransitionStartFadeFromBlack(String transitionId, MediaItem beforeMediaItem,
- long durationMs, int behavior) {
- super(transitionId, null, beforeMediaItem, durationMs, behavior);
- }
-
- /*
- * {@inheritDoc}
- */
- @Override
- public void generate() {
- }
-}
diff --git a/media/java/android/media/videoeditor/VideoEditorTestImpl.java b/media/java/android/media/videoeditor/VideoEditorTestImpl.java index 505b93e9f97f..ba84f499fb51 100644 --- a/media/java/android/media/videoeditor/VideoEditorTestImpl.java +++ b/media/java/android/media/videoeditor/VideoEditorTestImpl.java @@ -892,13 +892,7 @@ public class VideoEditorTestImpl implements VideoEditor { } final Transition transition; - if (TransitionStartCurtainOpening.class.getSimpleName().equals(type)) { - transition = new TransitionStartCurtainOpening(transitionId, beforeMediaItem, - durationMs, behavior); - } else if (TransitionStartFadeFromBlack.class.getSimpleName().equals(type)) { - transition = new TransitionStartFadeFromBlack(transitionId, beforeMediaItem, - durationMs, behavior); - } else if (TransitionAlpha.class.getSimpleName().equals(type)) { + if (TransitionAlpha.class.getSimpleName().equals(type)) { final int blending = Integer.parseInt(parser.getAttributeValue("", ATTR_BLENDING)); final String maskFilename = parser.getAttributeValue("", ATTR_MASK); final boolean invert = Boolean.getBoolean(parser.getAttributeValue("", ATTR_INVERT)); @@ -911,15 +905,9 @@ public class VideoEditorTestImpl implements VideoEditor { final int direction = Integer.parseInt(parser.getAttributeValue("", ATTR_DIRECTION)); transition = new TransitionSliding(transitionId, afterMediaItem, beforeMediaItem, durationMs, behavior, direction); - } else if (TransitionFadeToBlack.class.getSimpleName().equals(type)) { - transition = new TransitionFadeToBlack(transitionId, afterMediaItem, beforeMediaItem, + } else if (TransitionFadeBlack.class.getSimpleName().equals(type)) { + transition = new TransitionFadeBlack(transitionId, afterMediaItem, beforeMediaItem, durationMs, behavior); - } else if (TransitionEndCurtainClosing.class.getSimpleName().equals(type)) { - transition = new TransitionEndCurtainClosing(transitionId, afterMediaItem, durationMs, - behavior); - } else if (TransitionEndFadeToBlack.class.getSimpleName().equals(type)) { - transition = new TransitionEndFadeToBlack(transitionId, afterMediaItem, durationMs, - behavior); } else { transition = null; } @@ -1132,17 +1120,14 @@ public class VideoEditorTestImpl implements VideoEditor { */ private void computeTimelineDuration() { mDurationMs = 0; - for (MediaItem mediaItem : mMediaItems) { + final int mediaItemsCount = mMediaItems.size(); + for (int i = 0; i < mediaItemsCount; i++) { + final MediaItem mediaItem = mMediaItems.get(i); mDurationMs += mediaItem.getTimelineDuration(); - } - - // Subtract the transition times - for (Transition transition : mTransitions) { - if (!(transition instanceof TransitionStartCurtainOpening) - && !(transition instanceof TransitionStartFadeFromBlack) - && !(transition instanceof TransitionEndFadeToBlack) - && !(transition instanceof TransitionEndCurtainClosing)) { - mDurationMs -= transition.getDuration(); + if (mediaItem.getEndTransition() != null) { + if (i < mediaItemsCount - 1) { + mDurationMs -= mediaItem.getEndTransition().getDuration(); + } } } } diff --git a/media/java/android/media/videoeditor/WaveformData.java b/media/java/android/media/videoeditor/WaveformData.java new file mode 100644 index 000000000000..67789de89a34 --- /dev/null +++ b/media/java/android/media/videoeditor/WaveformData.java @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2010 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. + */ + +package android.media.videoeditor; + +/** + * Class which describes the waveform data of an audio track. The gain values + * represent the average gain for an audio frame. For audio codecs which do + * not operate on a per frame bases (eg. ALAW, ULAW) a reasonable audio frame + * duration will be assumed (eg. 50ms). + * {@hide} + */ +public class WaveformData { + // Instance variables + final int mFrameDurationMs; + final int mFramesCount; + final short[] mGains; + + /** + * This constructor shall not be used + */ + @SuppressWarnings("unused") + private WaveformData() { + mFrameDurationMs = 0; + mFramesCount = 0; + mGains = null; + } + + /** + * Constructor + * + * @param audioWaveformFilename The name of the audio waveform file + */ + WaveformData(String audioWaveformFilename) { + // TODO: Read these values from the file + mFrameDurationMs = 20; + mFramesCount = 300000 / mFrameDurationMs; + mGains = new short[mFramesCount]; + for (int i = 0; i < mFramesCount; i++) { + mGains[i] = (short)((i * 5) % 256); + } + } + + /** + * @return The duration of a frame in milliseconds + */ + public int getFrameDuration() { + return mFrameDurationMs; + } + + /** + * @return The number of frames within the waveform data + */ + public int getFramesCount() { + return mFramesCount; + } + + /** + * @return The array of frame gains. The size of the array is the frames + * count. The values of the frame gains range from 0 to 256. + */ + public short[] getFrameGains() { + return mGains; + } +} diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index 5505f14144a9..c957dba97adb 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -243,19 +243,22 @@ extern "C" int Visualizer_process( // derive capture scaling factor from peak value in current buffer // this gives more interesting captures for display. int32_t shift = 32; - for (size_t i = 0; i < inBuffer->frameCount; i++) { + int len = inBuffer->frameCount * 2; + for (size_t i = 0; i < len; i++) { int32_t smp = inBuffer->s16[i]; - if (smp < 0) smp = -smp; + if (smp < 0) smp = -smp - 1; // take care to keep the max negative in range int32_t clz = __builtin_clz(smp); if (shift > clz) shift = clz; } - // never scale by less than 8 to avoid returning unaltered PCM signal. - // add one to combine the division by 2 needed after summing left and right channels below - if (20 > shift) { - shift = (31 - 8 + 1) - shift; - } else { - shift = (3 + 1); + // A maximum amplitude signal will have 17 leading zeros, which we want to + // translate to a shift of 8 (for converting 16 bit to 8 bit) + shift = 25 - shift; + // Never scale by less than 8 to avoid returning unaltered PCM signal. + if (shift < 3) { + shift = 3; } + // add one to combine the division by 2 needed after summing left and right channels below + shift++; uint32_t captIdx; uint32_t inIdx; @@ -264,7 +267,7 @@ extern "C" int Visualizer_process( inIdx < inBuffer->frameCount && captIdx < pContext->mCaptureSize; inIdx++, captIdx++) { int32_t smp = inBuffer->s16[2 * inIdx] + inBuffer->s16[2 * inIdx + 1]; - smp = (smp + (1 << (shift - 1))) >> shift; + smp = smp >> shift; buf[captIdx] = ((uint8_t)smp)^0x80; } pContext->mCaptureIdx = captIdx; diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp index b46d8d0ee38d..e4f9a47d735c 100644 --- a/media/libstagefright/FileSource.cpp +++ b/media/libstagefright/FileSource.cpp @@ -21,7 +21,7 @@ namespace android { FileSource::FileSource(const char *filename) : mFile(fopen(filename, "rb")), - mFd(fileno(mFile)), + mFd(mFile == NULL ? -1 : fileno(mFile)), mOffset(0), mLength(-1), mDecryptHandle(NULL), diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index ee03c52fbf9c..965c370accf5 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -65,7 +65,7 @@ sp<MediaExtractor> MediaExtractor::Create( } if (!strncmp(mime, "drm", 3)) { - char *originalMime = strrchr(mime, '+') + 1; + const char *originalMime = strrchr(mime, '+') + 1; if (!strncmp(mime, "drm+es_based", 12)) { return new DRMExtractor(source, originalMime); diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 27faf4fbf5d2..092c33e4588a 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -281,7 +281,7 @@ status_t SampleTable::setSyncSampleParams(off_t data_offset, size_t data_size) { mNumSyncSamples = U32_AT(&header[4]); if (mNumSyncSamples < 2) { - LOGW("Table of sync samples is empty or has only a single entry!"); + LOGV("Table of sync samples is empty or has only a single entry!"); } mSyncSamples = new uint32_t[mNumSyncSamples]; diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index c937b068619b..0d854042d775 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -155,6 +155,8 @@ import android.view.SurfaceView; * */ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback { + private final static String TAG = "GLSurfaceView"; + private final static boolean LOG_ATTACH_DETACH = false; private final static boolean LOG_THREADS = false; private final static boolean LOG_PAUSE_RESUME = false; private final static boolean LOG_SURFACE = false; @@ -306,6 +308,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback if (mEGLWindowSurfaceFactory == null) { mEGLWindowSurfaceFactory = new DefaultWindowSurfaceFactory(); } + mRenderer = renderer; mGLThread = new GLThread(renderer); mGLThread.start(); } @@ -525,10 +528,34 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback /** * This method is used as part of the View class and is not normally * called or subclassed by clients of GLSurfaceView. + */ + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + if (LOG_ATTACH_DETACH) { + Log.d(TAG, "onAttachedToWindow reattach =" + mDetached); + } + if (mDetached && (mRenderer != null)) { + mGLThread = new GLThread(mRenderer); + mGLThread.start(); + } + mDetached = false; + } + + /** + * This method is used as part of the View class and is not normally + * called or subclassed by clients of GLSurfaceView. * Must not be called before a renderer has been set. */ @Override protected void onDetachedFromWindow() { + if (LOG_ATTACH_DETACH) { + Log.d(TAG, "onDetachedFromWindow"); + } + if (mGLThread != null) { + mGLThread.requestExitAndWait(); + } + mDetached = true; super.onDetachedFromWindow(); } @@ -1726,6 +1753,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback private boolean mSizeChanged = true; private GLThread mGLThread; + private Renderer mRenderer; + private boolean mDetached; private EGLConfigChooser mEGLConfigChooser; private EGLContextFactory mEGLContextFactory; private EGLWindowSurfaceFactory mEGLWindowSurfaceFactory; diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index ae924cd6e5ba..c8041fc7f69e 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -8,6 +8,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ EGL/egl.cpp \ + EGL/trace.cpp \ EGL/getProcAddress.cpp.arm \ EGL/hooks.cpp \ EGL/Loader.cpp \ @@ -33,6 +34,7 @@ endif LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -fvisibility=hidden +LOCAL_CFLAGS += -DEGL_TRACE=1 ifeq ($(TARGET_BOARD_PLATFORM),msm7k) LOCAL_CFLAGS += -DADRENO130=1 diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index bc944a038455..f744b72df26f 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -285,6 +285,58 @@ EGLAPI gl_hooks_t gHooks[2][IMPL_NUM_IMPLEMENTATIONS]; EGLAPI gl_hooks_t gHooksNoContext; EGLAPI pthread_key_t gGLWrapperKey = -1; +#if EGL_TRACE + +EGLAPI pthread_key_t gGLTraceKey = -1; + +// ---------------------------------------------------------------------------- + +static int gEGLTraceLevel; +static int gEGLApplicationTraceLevel; +extern EGLAPI gl_hooks_t gHooksTrace; + +static inline void setGlTraceThreadSpecific(gl_hooks_t const *value) { + pthread_setspecific(gGLTraceKey, value); +} + +gl_hooks_t const* getGLTraceThreadSpecific() { + return static_cast<gl_hooks_t*>(pthread_getspecific(gGLTraceKey)); +} + +static void initEglTraceLevel() { + char value[PROPERTY_VALUE_MAX]; + property_get("debug.egl.trace", value, "0"); + int propertyLevel = atoi(value); + int applicationLevel = gEGLApplicationTraceLevel; + gEGLTraceLevel = propertyLevel > applicationLevel ? propertyLevel : applicationLevel; +} + +static void setGLHooksThreadSpecific(gl_hooks_t const *value) { + if (gEGLTraceLevel > 0) { + setGlTraceThreadSpecific(value); + setGlThreadSpecific(&gHooksTrace); + } else { + setGlThreadSpecific(value); + } +} + +/* + * Global entry point to allow applications to modify their own trace level. + * The effective trace level is the max of this level and the value of debug.egl.trace. + */ +extern "C" +void setGLTraceLevel(int level) { + gEGLApplicationTraceLevel = level; +} + +#else + +static inline void setGLHooksThreadSpecific(gl_hooks_t const *value) { + setGlThreadSpecific(value); +} + +#endif + // ---------------------------------------------------------------------------- static __attribute__((noinline)) @@ -459,13 +511,17 @@ static void early_egl_init(void) #if !USE_FAST_TLS_KEY pthread_key_create(&gGLWrapperKey, NULL); #endif +#if EGL_TRACE + pthread_key_create(&gGLTraceKey, NULL); + initEglTraceLevel(); +#endif uint32_t addr = (uint32_t)((void*)gl_no_context); android_memset32( (uint32_t*)(void*)&gHooksNoContext, addr, sizeof(gHooksNoContext)); - setGlThreadSpecific(&gHooksNoContext); + setGLHooksThreadSpecific(&gHooksNoContext); } static pthread_once_t once_control = PTHREAD_ONCE_INIT; @@ -677,9 +733,17 @@ EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) dp->refs++; return EGL_TRUE; } - - setGlThreadSpecific(&gHooksNoContext); - + +#if EGL_TRACE + + // Called both at early_init time and at this time. (Early_init is pre-zygote, so + // the information from that call may be stale.) + initEglTraceLevel(); + +#endif + + setGLHooksThreadSpecific(&gHooksNoContext); + // initialize each EGL and // build our own extension string first, based on the extension we know // and the extension supported by our client implementation @@ -1238,11 +1302,11 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw, // cur_c has to be valid here (but could be terminated) if (ctx != EGL_NO_CONTEXT) { - setGlThreadSpecific(c->cnx->hooks[c->version]); + setGLHooksThreadSpecific(c->cnx->hooks[c->version]); setContext(ctx); _c.acquire(); } else { - setGlThreadSpecific(&gHooksNoContext); + setGLHooksThreadSpecific(&gHooksNoContext); setContext(EGL_NO_CONTEXT); } _cur_c.release(); @@ -1434,6 +1498,9 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) // Extensions are independent of the bound context cnx->hooks[GLESv1_INDEX]->ext.extensions[slot] = cnx->hooks[GLESv2_INDEX]->ext.extensions[slot] = +#if EGL_TRACE + gHooksTrace.ext.extensions[slot] = +#endif cnx->egl.eglGetProcAddress(procname); } } diff --git a/opengl/libs/EGL/trace.cpp b/opengl/libs/EGL/trace.cpp new file mode 100644 index 000000000000..48eeaff5882b --- /dev/null +++ b/opengl/libs/EGL/trace.cpp @@ -0,0 +1,247 @@ +/* + ** Copyright 2010, 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. + */ + +#if EGL_TRACE + +#include <stdarg.h> +#include <stdlib.h> + +#include <EGL/egl.h> +#include <EGL/eglext.h> +#include <GLES/gl.h> +#include <GLES/glext.h> + +#include <cutils/log.h> + +#include "hooks.h" + +// ---------------------------------------------------------------------------- +namespace android { +// ---------------------------------------------------------------------------- + +struct GLenumString { + GLenum e; + const char* s; +}; + +#undef GL_ENUM +#define GL_ENUM(VAL,NAME) {VAL, #NAME}, + +static GLenumString g_enumnames[] = { +#include "enums.in" +}; +#undef GL_ENUM + +static int compareGLEnum(const void* a, const void* b) { + return ((const GLenumString*) a)->e - ((const GLenumString*) b)->e; +} + +static const char* GLEnumToString(GLenum e) { + GLenumString key = {e, ""}; + const GLenumString* result = (const GLenumString*) bsearch( + &key, g_enumnames, + sizeof(g_enumnames) / sizeof(g_enumnames[0]), + sizeof(g_enumnames[0]), compareGLEnum); + if (result) { + return result->s; + } + return NULL; +} + +static GLenumString g_bitfieldNames[] = { + {0x00004000, "GL_COLOR_BUFFER_BIT"}, + {0x00000400, "GL_STENCIL_BUFFER_BIT"}, + {0x00000100, "GL_DEPTH_BUFFER_BIT"} +}; + + +static void TraceGLShaderSource(GLuint shader, GLsizei count, + const GLchar** string, const GLint* length) { + LOGD("const char* shaderSrc[] = {"); + for (GLsizei i = 0; i < count; i++) { + const char* comma = i < count-1 ? "," : ""; + const GLchar* s = string[i]; + if (length) { + GLint len = length[i]; + LOGD(" \"%*s\"%s", len, s, comma); + } else { + LOGD(" \"%s\"%s", s, comma); + } + } + LOGD("};"); + if (length) { + LOGD("const GLint* shaderLength[] = {"); + for (GLsizei i = 0; i < count; i++) { + const char* comma = i < count-1 ? "," : ""; + GLint len = length[i]; + LOGD(" \"%d\"%s", len, comma); + } + LOGD("};"); + LOGD("glShaderSource(%u, %u, shaderSrc, shaderLength);", + shader, count); + } else { + LOGD("glShaderSource(%u, %u, shaderSrc, (const GLint*) 0);", + shader, count); + } +} + +static void TraceGL(const char* name, int numArgs, ...) { + va_list argp; + va_start(argp, numArgs); + if (strcmp(name, "glShaderSource") == 0) { + va_arg(argp, const char*); + GLuint shader = va_arg(argp, GLuint); + va_arg(argp, const char*); + GLsizei count = va_arg(argp, GLsizei); + va_arg(argp, const char*); + const GLchar** string = (const GLchar**) va_arg(argp, void*); + va_arg(argp, const char*); + const GLint* length = (const GLint*) va_arg(argp, void*); + TraceGLShaderSource(shader, count, string, length); + va_end(argp); + return; + } + const int lineSize = 500; + char line[lineSize]; + int line_index = 0; + #define APPEND(...) \ + line_index += snprintf(line + line_index, lineSize-line_index, __VA_ARGS__); + APPEND("%s(", name); + for (int i = 0; i < numArgs; i++) { + if (i > 0) { + APPEND(", "); + } + const char* type = va_arg(argp, const char*); + bool isPtr = type[strlen(type)-1] == '*' + || strcmp(type, "GLeglImageOES") == 0; + if (isPtr) { + const void* arg = va_arg(argp, const void*); + APPEND("(%s) 0x%08x", type, (size_t) arg); + } else if (strcmp(type, "GLbitfield") == 0) { + size_t arg = va_arg(argp, size_t); + bool first = true; + for (size_t i = 0; i < sizeof(g_bitfieldNames) / sizeof(g_bitfieldNames[0]); i++) { + const GLenumString* b = &g_bitfieldNames[i]; + if (b->e & arg) { + if (first) { + first = false; + } else { + APPEND(" | "); + } + APPEND("%s", b->s); + arg &= ~b->e; + } + } + if (first || arg != 0) { + if (!first) { + APPEND(" | "); + } + APPEND("0x%08x", arg); + } + } else if (strcmp(type, "GLboolean") == 0) { + int arg = va_arg(argp, int); + APPEND("%s", arg ? "GL_TRUE" : "GL_FALSE"); + } else if (strcmp(type, "GLclampf") == 0) { + double arg = va_arg(argp, double); + APPEND("%g", arg); + } else if (strcmp(type, "GLenum") == 0) { + GLenum arg = va_arg(argp, int); + const char* s = GLEnumToString(arg); + if (s) { + APPEND("%s", s); + } else { + APPEND("0x%x", arg); + } + } else if (strcmp(type, "GLfixed") == 0) { + int arg = va_arg(argp, int); + APPEND("0x%08x", arg); + } else if (strcmp(type, "GLfloat") == 0) { + double arg = va_arg(argp, double); + APPEND("%g", arg); + } else if (strcmp(type, "GLint") == 0) { + int arg = va_arg(argp, int); + const char* s = NULL; + if (strcmp(name, "glTexParameteri") == 0) { + s = GLEnumToString(arg); + } + if (s) { + APPEND("%s", s); + } else { + APPEND("%d", arg); + } + } else if (strcmp(type, "GLintptr") == 0) { + int arg = va_arg(argp, unsigned int); + APPEND("%u", arg); + } else if (strcmp(type, "GLsizei") == 0) { + int arg = va_arg(argp, size_t); + APPEND("%u", arg); + } else if (strcmp(type, "GLsizeiptr") == 0) { + int arg = va_arg(argp, size_t); + APPEND("%u", arg); + } else if (strcmp(type, "GLuint") == 0) { + int arg = va_arg(argp, unsigned int); + APPEND("%u", arg); + } else { + APPEND("/* ??? %s */", type); + break; + } + } + APPEND(");"); + line[lineSize-1] = '\0'; + LOGD("%s", line); + va_end(argp); +} + +#undef TRACE_GL_VOID +#undef TRACE_GL + +#define TRACE_GL_VOID(_api, _args, _argList, ...) \ +static void Tracing_ ## _api _args { \ + TraceGL(#_api, __VA_ARGS__); \ + gl_hooks_t::gl_t const * const _c = &getGLTraceThreadSpecific()->gl; \ + _c->_api _argList; \ +} + +#define TRACE_GL(_type, _api, _args, _argList, ...) \ +static _type Tracing_ ## _api _args { \ + TraceGL(#_api, __VA_ARGS__); \ + gl_hooks_t::gl_t const * const _c = &getGLTraceThreadSpecific()->gl; \ + return _c->_api _argList; \ +} + +extern "C" { +#include "../trace.in" +} +#undef TRACE_GL_VOID +#undef TRACE_GL + +#define GL_ENTRY(_r, _api, ...) Tracing_ ## _api, + +EGLAPI gl_hooks_t gHooksTrace = { + { + #include "entries.in" + }, + { + {0} + } +}; +#undef GL_ENTRY + +// ---------------------------------------------------------------------------- +}; // namespace android +// ---------------------------------------------------------------------------- + +#endif // EGL_TRACE diff --git a/opengl/libs/enums.in b/opengl/libs/enums.in new file mode 100644 index 000000000000..f9752c24ae7e --- /dev/null +++ b/opengl/libs/enums.in @@ -0,0 +1,594 @@ +GL_ENUM(0x0000,GL_POINTS) +GL_ENUM(0x0001,GL_LINES) +GL_ENUM(0x0002,GL_LINE_LOOP) +GL_ENUM(0x0003,GL_LINE_STRIP) +GL_ENUM(0x0004,GL_TRIANGLES) +GL_ENUM(0x0005,GL_TRIANGLE_STRIP) +GL_ENUM(0x0006,GL_TRIANGLE_FAN) +GL_ENUM(0x0104,GL_ADD) +GL_ENUM(0x0200,GL_NEVER) +GL_ENUM(0x0201,GL_LESS) +GL_ENUM(0x0202,GL_EQUAL) +GL_ENUM(0x0203,GL_LEQUAL) +GL_ENUM(0x0204,GL_GREATER) +GL_ENUM(0x0205,GL_NOTEQUAL) +GL_ENUM(0x0206,GL_GEQUAL) +GL_ENUM(0x0207,GL_ALWAYS) +GL_ENUM(0x0300,GL_SRC_COLOR) +GL_ENUM(0x0301,GL_ONE_MINUS_SRC_COLOR) +GL_ENUM(0x0302,GL_SRC_ALPHA) +GL_ENUM(0x0303,GL_ONE_MINUS_SRC_ALPHA) +GL_ENUM(0x0304,GL_DST_ALPHA) +GL_ENUM(0x0305,GL_ONE_MINUS_DST_ALPHA) +GL_ENUM(0x0306,GL_DST_COLOR) +GL_ENUM(0x0307,GL_ONE_MINUS_DST_COLOR) +GL_ENUM(0x0308,GL_SRC_ALPHA_SATURATE) +GL_ENUM(0x0404,GL_FRONT) +GL_ENUM(0x0405,GL_BACK) +GL_ENUM(0x0408,GL_FRONT_AND_BACK) +GL_ENUM(0x0500,GL_INVALID_ENUM) +GL_ENUM(0x0501,GL_INVALID_VALUE) +GL_ENUM(0x0502,GL_INVALID_OPERATION) +GL_ENUM(0x0503,GL_STACK_OVERFLOW) +GL_ENUM(0x0504,GL_STACK_UNDERFLOW) +GL_ENUM(0x0505,GL_OUT_OF_MEMORY) +GL_ENUM(0x0506,GL_INVALID_FRAMEBUFFER_OPERATION_OES) +GL_ENUM(0x0800,GL_EXP) +GL_ENUM(0x0801,GL_EXP2) +GL_ENUM(0x0900,GL_CW) +GL_ENUM(0x0901,GL_CCW) +GL_ENUM(0x0B00,GL_CURRENT_COLOR) +GL_ENUM(0x0B02,GL_CURRENT_NORMAL) +GL_ENUM(0x0B03,GL_CURRENT_TEXTURE_COORDS) +GL_ENUM(0x0B10,GL_POINT_SMOOTH) +GL_ENUM(0x0B11,GL_POINT_SIZE) +GL_ENUM(0x0B12,GL_SMOOTH_POINT_SIZE_RANGE) +GL_ENUM(0x0B20,GL_LINE_SMOOTH) +GL_ENUM(0x0B21,GL_LINE_WIDTH) +GL_ENUM(0x0B22,GL_SMOOTH_LINE_WIDTH_RANGE) +GL_ENUM(0x0B44,GL_CULL_FACE) +GL_ENUM(0x0B45,GL_CULL_FACE_MODE) +GL_ENUM(0x0B46,GL_FRONT_FACE) +GL_ENUM(0x0B50,GL_LIGHTING) +GL_ENUM(0x0B52,GL_LIGHT_MODEL_TWO_SIDE) +GL_ENUM(0x0B53,GL_LIGHT_MODEL_AMBIENT) +GL_ENUM(0x0B54,GL_SHADE_MODEL) +GL_ENUM(0x0B57,GL_COLOR_MATERIAL) +GL_ENUM(0x0B60,GL_FOG) +GL_ENUM(0x0B62,GL_FOG_DENSITY) +GL_ENUM(0x0B63,GL_FOG_START) +GL_ENUM(0x0B64,GL_FOG_END) +GL_ENUM(0x0B65,GL_FOG_MODE) +GL_ENUM(0x0B66,GL_FOG_COLOR) +GL_ENUM(0x0B70,GL_DEPTH_RANGE) +GL_ENUM(0x0B71,GL_DEPTH_TEST) +GL_ENUM(0x0B72,GL_DEPTH_WRITEMASK) +GL_ENUM(0x0B73,GL_DEPTH_CLEAR_VALUE) +GL_ENUM(0x0B74,GL_DEPTH_FUNC) +GL_ENUM(0x0B90,GL_STENCIL_TEST) +GL_ENUM(0x0B91,GL_STENCIL_CLEAR_VALUE) +GL_ENUM(0x0B92,GL_STENCIL_FUNC) +GL_ENUM(0x0B93,GL_STENCIL_VALUE_MASK) +GL_ENUM(0x0B94,GL_STENCIL_FAIL) +GL_ENUM(0x0B95,GL_STENCIL_PASS_DEPTH_FAIL) +GL_ENUM(0x0B96,GL_STENCIL_PASS_DEPTH_PASS) +GL_ENUM(0x0B97,GL_STENCIL_REF) +GL_ENUM(0x0B98,GL_STENCIL_WRITEMASK) +GL_ENUM(0x0BA0,GL_MATRIX_MODE) +GL_ENUM(0x0BA1,GL_NORMALIZE) +GL_ENUM(0x0BA2,GL_VIEWPORT) +GL_ENUM(0x0BA3,GL_MODELVIEW_STACK_DEPTH) +GL_ENUM(0x0BA4,GL_PROJECTION_STACK_DEPTH) +GL_ENUM(0x0BA5,GL_TEXTURE_STACK_DEPTH) +GL_ENUM(0x0BA6,GL_MODELVIEW_MATRIX) +GL_ENUM(0x0BA7,GL_PROJECTION_MATRIX) +GL_ENUM(0x0BA8,GL_TEXTURE_MATRIX) +GL_ENUM(0x0BC0,GL_ALPHA_TEST) +GL_ENUM(0x0BC1,GL_ALPHA_TEST_FUNC) +GL_ENUM(0x0BC2,GL_ALPHA_TEST_REF) +GL_ENUM(0x0BD0,GL_DITHER) +GL_ENUM(0x0BE0,GL_BLEND_DST) +GL_ENUM(0x0BE1,GL_BLEND_SRC) +GL_ENUM(0x0BE2,GL_BLEND) +GL_ENUM(0x0BF0,GL_LOGIC_OP_MODE) +GL_ENUM(0x0BF2,GL_COLOR_LOGIC_OP) +GL_ENUM(0x0C10,GL_SCISSOR_BOX) +GL_ENUM(0x0C11,GL_SCISSOR_TEST) +GL_ENUM(0x0C22,GL_COLOR_CLEAR_VALUE) +GL_ENUM(0x0C23,GL_COLOR_WRITEMASK) +GL_ENUM(0x0C50,GL_PERSPECTIVE_CORRECTION_HINT) +GL_ENUM(0x0C51,GL_POINT_SMOOTH_HINT) +GL_ENUM(0x0C52,GL_LINE_SMOOTH_HINT) +GL_ENUM(0x0C54,GL_FOG_HINT) +GL_ENUM(0x0CF5,GL_UNPACK_ALIGNMENT) +GL_ENUM(0x0D05,GL_PACK_ALIGNMENT) +GL_ENUM(0x0D1C,GL_ALPHA_SCALE) +GL_ENUM(0x0D31,GL_MAX_LIGHTS) +GL_ENUM(0x0D32,GL_MAX_CLIP_PLANES) +GL_ENUM(0x0D33,GL_MAX_TEXTURE_SIZE) +GL_ENUM(0x0D36,GL_MAX_MODELVIEW_STACK_DEPTH) +GL_ENUM(0x0D38,GL_MAX_PROJECTION_STACK_DEPTH) +GL_ENUM(0x0D39,GL_MAX_TEXTURE_STACK_DEPTH) +GL_ENUM(0x0D3A,GL_MAX_VIEWPORT_DIMS) +GL_ENUM(0x0D50,GL_SUBPIXEL_BITS) +GL_ENUM(0x0D52,GL_RED_BITS) +GL_ENUM(0x0D53,GL_GREEN_BITS) +GL_ENUM(0x0D54,GL_BLUE_BITS) +GL_ENUM(0x0D55,GL_ALPHA_BITS) +GL_ENUM(0x0D56,GL_DEPTH_BITS) +GL_ENUM(0x0D57,GL_STENCIL_BITS) +GL_ENUM(0x0DE1,GL_TEXTURE_2D) +GL_ENUM(0x1100,GL_DONT_CARE) +GL_ENUM(0x1101,GL_FASTEST) +GL_ENUM(0x1102,GL_NICEST) +GL_ENUM(0x1200,GL_AMBIENT) +GL_ENUM(0x1201,GL_DIFFUSE) +GL_ENUM(0x1202,GL_SPECULAR) +GL_ENUM(0x1203,GL_POSITION) +GL_ENUM(0x1204,GL_SPOT_DIRECTION) +GL_ENUM(0x1205,GL_SPOT_EXPONENT) +GL_ENUM(0x1206,GL_SPOT_CUTOFF) +GL_ENUM(0x1207,GL_CONSTANT_ATTENUATION) +GL_ENUM(0x1208,GL_LINEAR_ATTENUATION) +GL_ENUM(0x1209,GL_QUADRATIC_ATTENUATION) +GL_ENUM(0x1400,GL_BYTE) +GL_ENUM(0x1401,GL_UNSIGNED_BYTE) +GL_ENUM(0x1402,GL_SHORT) +GL_ENUM(0x1403,GL_UNSIGNED_SHORT) +GL_ENUM(0x1404,GL_INT) +GL_ENUM(0x1405,GL_UNSIGNED_INT) +GL_ENUM(0x1406,GL_FLOAT) +GL_ENUM(0x140C,GL_FIXED) +GL_ENUM(0x1500,GL_CLEAR) +GL_ENUM(0x1501,GL_AND) +GL_ENUM(0x1502,GL_AND_REVERSE) +GL_ENUM(0x1503,GL_COPY) +GL_ENUM(0x1504,GL_AND_INVERTED) +GL_ENUM(0x1505,GL_NOOP) +GL_ENUM(0x1506,GL_XOR) +GL_ENUM(0x1507,GL_OR) +GL_ENUM(0x1508,GL_NOR) +GL_ENUM(0x1509,GL_EQUIV) +GL_ENUM(0x150A,GL_INVERT) +GL_ENUM(0x150B,GL_OR_REVERSE) +GL_ENUM(0x150C,GL_COPY_INVERTED) +GL_ENUM(0x150D,GL_OR_INVERTED) +GL_ENUM(0x150E,GL_NAND) +GL_ENUM(0x150F,GL_SET) +GL_ENUM(0x1600,GL_EMISSION) +GL_ENUM(0x1601,GL_SHININESS) +GL_ENUM(0x1602,GL_AMBIENT_AND_DIFFUSE) +GL_ENUM(0x1700,GL_MODELVIEW) +GL_ENUM(0x1701,GL_PROJECTION) +GL_ENUM(0x1702,GL_TEXTURE) +GL_ENUM(0x1800,GL_COLOR_EXT) +GL_ENUM(0x1801,GL_DEPTH_EXT) +GL_ENUM(0x1802,GL_STENCIL_EXT) +GL_ENUM(0x1901,GL_STENCIL_INDEX) +GL_ENUM(0x1902,GL_DEPTH_COMPONENT) +GL_ENUM(0x1906,GL_ALPHA) +GL_ENUM(0x1907,GL_RGB) +GL_ENUM(0x1908,GL_RGBA) +GL_ENUM(0x1909,GL_LUMINANCE) +GL_ENUM(0x190A,GL_LUMINANCE_ALPHA) +GL_ENUM(0x1D00,GL_FLAT) +GL_ENUM(0x1D01,GL_SMOOTH) +GL_ENUM(0x1E00,GL_KEEP) +GL_ENUM(0x1E01,GL_REPLACE) +GL_ENUM(0x1E02,GL_INCR) +GL_ENUM(0x1E03,GL_DECR) +GL_ENUM(0x1F00,GL_VENDOR) +GL_ENUM(0x1F01,GL_RENDERER) +GL_ENUM(0x1F02,GL_VERSION) +GL_ENUM(0x1F03,GL_EXTENSIONS) +GL_ENUM(0x2100,GL_MODULATE) +GL_ENUM(0x2101,GL_DECAL) +GL_ENUM(0x2200,GL_TEXTURE_ENV_MODE) +GL_ENUM(0x2201,GL_TEXTURE_ENV_COLOR) +GL_ENUM(0x2300,GL_TEXTURE_ENV) +GL_ENUM(0x2500,GL_TEXTURE_GEN_MODE_OES) +GL_ENUM(0x2600,GL_NEAREST) +GL_ENUM(0x2601,GL_LINEAR) +GL_ENUM(0x2700,GL_NEAREST_MIPMAP_NEAREST) +GL_ENUM(0x2701,GL_LINEAR_MIPMAP_NEAREST) +GL_ENUM(0x2702,GL_NEAREST_MIPMAP_LINEAR) +GL_ENUM(0x2703,GL_LINEAR_MIPMAP_LINEAR) +GL_ENUM(0x2800,GL_TEXTURE_MAG_FILTER) +GL_ENUM(0x2801,GL_TEXTURE_MIN_FILTER) +GL_ENUM(0x2802,GL_TEXTURE_WRAP_S) +GL_ENUM(0x2803,GL_TEXTURE_WRAP_T) +GL_ENUM(0x2901,GL_REPEAT) +GL_ENUM(0x2A00,GL_POLYGON_OFFSET_UNITS) +GL_ENUM(0x3000,GL_CLIP_PLANE0) +GL_ENUM(0x3001,GL_CLIP_PLANE1) +GL_ENUM(0x3002,GL_CLIP_PLANE2) +GL_ENUM(0x3003,GL_CLIP_PLANE3) +GL_ENUM(0x3004,GL_CLIP_PLANE4) +GL_ENUM(0x3005,GL_CLIP_PLANE5) +GL_ENUM(0x4000,GL_LIGHT0) +GL_ENUM(0x4001,GL_LIGHT1) +GL_ENUM(0x4002,GL_LIGHT2) +GL_ENUM(0x4003,GL_LIGHT3) +GL_ENUM(0x4004,GL_LIGHT4) +GL_ENUM(0x4005,GL_LIGHT5) +GL_ENUM(0x4006,GL_LIGHT6) +GL_ENUM(0x4007,GL_LIGHT7) +GL_ENUM(0x8000,GL_COVERAGE_BUFFER_BIT_NV) +GL_ENUM(0x8001,GL_CONSTANT_COLOR) +GL_ENUM(0x8002,GL_ONE_MINUS_CONSTANT_COLOR) +GL_ENUM(0x8003,GL_CONSTANT_ALPHA) +GL_ENUM(0x8004,GL_ONE_MINUS_CONSTANT_ALPHA) +GL_ENUM(0x8005,GL_BLEND_COLOR) +GL_ENUM(0x8006,GL_FUNC_ADD_OES) +GL_ENUM(0x8007,GL_MIN_EXT) +GL_ENUM(0x8008,GL_MAX_EXT) +GL_ENUM(0x8009,GL_BLEND_EQUATION_RGB_OES) +GL_ENUM(0x800A,GL_FUNC_SUBTRACT_OES) +GL_ENUM(0x800B,GL_FUNC_REVERSE_SUBTRACT_OES) +GL_ENUM(0x8033,GL_UNSIGNED_SHORT_4_4_4_4) +GL_ENUM(0x8034,GL_UNSIGNED_SHORT_5_5_5_1) +GL_ENUM(0x8037,GL_POLYGON_OFFSET_FILL) +GL_ENUM(0x8038,GL_POLYGON_OFFSET_FACTOR) +GL_ENUM(0x803A,GL_RESCALE_NORMAL) +GL_ENUM(0x8051,GL_RGB8_OES) +GL_ENUM(0x8056,GL_RGBA4_OES) +GL_ENUM(0x8057,GL_RGB5_A1_OES) +GL_ENUM(0x8058,GL_RGBA8_OES) +GL_ENUM(0x8069,GL_TEXTURE_BINDING_2D) +GL_ENUM(0x806A,GL_TEXTURE_BINDING_3D_OES) +GL_ENUM(0x806F,GL_TEXTURE_3D_OES) +GL_ENUM(0x8072,GL_TEXTURE_WRAP_R_OES) +GL_ENUM(0x8073,GL_MAX_3D_TEXTURE_SIZE_OES) +GL_ENUM(0x8074,GL_VERTEX_ARRAY) +GL_ENUM(0x8075,GL_NORMAL_ARRAY) +GL_ENUM(0x8076,GL_COLOR_ARRAY) +GL_ENUM(0x8078,GL_TEXTURE_COORD_ARRAY) +GL_ENUM(0x807A,GL_VERTEX_ARRAY_SIZE) +GL_ENUM(0x807B,GL_VERTEX_ARRAY_TYPE) +GL_ENUM(0x807C,GL_VERTEX_ARRAY_STRIDE) +GL_ENUM(0x807E,GL_NORMAL_ARRAY_TYPE) +GL_ENUM(0x807F,GL_NORMAL_ARRAY_STRIDE) +GL_ENUM(0x8081,GL_COLOR_ARRAY_SIZE) +GL_ENUM(0x8082,GL_COLOR_ARRAY_TYPE) +GL_ENUM(0x8083,GL_COLOR_ARRAY_STRIDE) +GL_ENUM(0x8088,GL_TEXTURE_COORD_ARRAY_SIZE) +GL_ENUM(0x8089,GL_TEXTURE_COORD_ARRAY_TYPE) +GL_ENUM(0x808A,GL_TEXTURE_COORD_ARRAY_STRIDE) +GL_ENUM(0x808E,GL_VERTEX_ARRAY_POINTER) +GL_ENUM(0x808F,GL_NORMAL_ARRAY_POINTER) +GL_ENUM(0x8090,GL_COLOR_ARRAY_POINTER) +GL_ENUM(0x8092,GL_TEXTURE_COORD_ARRAY_POINTER) +GL_ENUM(0x809D,GL_MULTISAMPLE) +GL_ENUM(0x809E,GL_SAMPLE_ALPHA_TO_COVERAGE) +GL_ENUM(0x809F,GL_SAMPLE_ALPHA_TO_ONE) +GL_ENUM(0x80A0,GL_SAMPLE_COVERAGE) +GL_ENUM(0x80A8,GL_SAMPLE_BUFFERS) +GL_ENUM(0x80A9,GL_SAMPLES) +GL_ENUM(0x80AA,GL_SAMPLE_COVERAGE_VALUE) +GL_ENUM(0x80AB,GL_SAMPLE_COVERAGE_INVERT) +GL_ENUM(0x80C8,GL_BLEND_DST_RGB_OES) +GL_ENUM(0x80C9,GL_BLEND_SRC_RGB_OES) +GL_ENUM(0x80CA,GL_BLEND_DST_ALPHA_OES) +GL_ENUM(0x80CB,GL_BLEND_SRC_ALPHA_OES) +GL_ENUM(0x80E1,GL_BGRA_EXT) +GL_ENUM(0x8126,GL_POINT_SIZE_MIN) +GL_ENUM(0x8127,GL_POINT_SIZE_MAX) +GL_ENUM(0x8128,GL_POINT_FADE_THRESHOLD_SIZE) +GL_ENUM(0x8129,GL_POINT_DISTANCE_ATTENUATION) +GL_ENUM(0x812F,GL_CLAMP_TO_EDGE) +GL_ENUM(0x8191,GL_GENERATE_MIPMAP) +GL_ENUM(0x8192,GL_GENERATE_MIPMAP_HINT) +GL_ENUM(0x81A5,GL_DEPTH_COMPONENT16_OES) +GL_ENUM(0x81A6,GL_DEPTH_COMPONENT24_OES) +GL_ENUM(0x81A7,GL_DEPTH_COMPONENT32_OES) +GL_ENUM(0x8363,GL_UNSIGNED_SHORT_5_6_5) +GL_ENUM(0x8365,GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT) +GL_ENUM(0x8366,GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT) +GL_ENUM(0x8368,GL_UNSIGNED_INT_2_10_10_10_REV_EXT) +GL_ENUM(0x8370,GL_MIRRORED_REPEAT_OES) +GL_ENUM(0x83F0,GL_COMPRESSED_RGB_S3TC_DXT1_EXT) +GL_ENUM(0x83F1,GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) +GL_ENUM(0x846D,GL_ALIASED_POINT_SIZE_RANGE) +GL_ENUM(0x846E,GL_ALIASED_LINE_WIDTH_RANGE) +GL_ENUM(0x84C0,GL_TEXTURE0) +GL_ENUM(0x84C1,GL_TEXTURE1) +GL_ENUM(0x84C2,GL_TEXTURE2) +GL_ENUM(0x84C3,GL_TEXTURE3) +GL_ENUM(0x84C4,GL_TEXTURE4) +GL_ENUM(0x84C5,GL_TEXTURE5) +GL_ENUM(0x84C6,GL_TEXTURE6) +GL_ENUM(0x84C7,GL_TEXTURE7) +GL_ENUM(0x84C8,GL_TEXTURE8) +GL_ENUM(0x84C9,GL_TEXTURE9) +GL_ENUM(0x84CA,GL_TEXTURE10) +GL_ENUM(0x84CB,GL_TEXTURE11) +GL_ENUM(0x84CC,GL_TEXTURE12) +GL_ENUM(0x84CD,GL_TEXTURE13) +GL_ENUM(0x84CE,GL_TEXTURE14) +GL_ENUM(0x84CF,GL_TEXTURE15) +GL_ENUM(0x84D0,GL_TEXTURE16) +GL_ENUM(0x84D1,GL_TEXTURE17) +GL_ENUM(0x84D2,GL_TEXTURE18) +GL_ENUM(0x84D3,GL_TEXTURE19) +GL_ENUM(0x84D4,GL_TEXTURE20) +GL_ENUM(0x84D5,GL_TEXTURE21) +GL_ENUM(0x84D6,GL_TEXTURE22) +GL_ENUM(0x84D7,GL_TEXTURE23) +GL_ENUM(0x84D8,GL_TEXTURE24) +GL_ENUM(0x84D9,GL_TEXTURE25) +GL_ENUM(0x84DA,GL_TEXTURE26) +GL_ENUM(0x84DB,GL_TEXTURE27) +GL_ENUM(0x84DC,GL_TEXTURE28) +GL_ENUM(0x84DD,GL_TEXTURE29) +GL_ENUM(0x84DE,GL_TEXTURE30) +GL_ENUM(0x84DF,GL_TEXTURE31) +GL_ENUM(0x84E0,GL_ACTIVE_TEXTURE) +GL_ENUM(0x84E1,GL_CLIENT_ACTIVE_TEXTURE) +GL_ENUM(0x84E2,GL_MAX_TEXTURE_UNITS) +GL_ENUM(0x84E7,GL_SUBTRACT) +GL_ENUM(0x84E8,GL_MAX_RENDERBUFFER_SIZE_OES) +GL_ENUM(0x84F2,GL_ALL_COMPLETED_NV) +GL_ENUM(0x84F3,GL_FENCE_STATUS_NV) +GL_ENUM(0x84F4,GL_FENCE_CONDITION_NV) +GL_ENUM(0x84F9,GL_DEPTH_STENCIL_OES) +GL_ENUM(0x84FA,GL_UNSIGNED_INT_24_8_OES) +GL_ENUM(0x84FD,GL_MAX_TEXTURE_LOD_BIAS_EXT) +GL_ENUM(0x84FE,GL_TEXTURE_MAX_ANISOTROPY_EXT) +GL_ENUM(0x84FF,GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT) +GL_ENUM(0x8500,GL_TEXTURE_FILTER_CONTROL_EXT) +GL_ENUM(0x8501,GL_TEXTURE_LOD_BIAS_EXT) +GL_ENUM(0x8507,GL_INCR_WRAP_OES) +GL_ENUM(0x8508,GL_DECR_WRAP_OES) +GL_ENUM(0x8511,GL_NORMAL_MAP_OES) +GL_ENUM(0x8512,GL_REFLECTION_MAP_OES) +GL_ENUM(0x8513,GL_TEXTURE_CUBE_MAP_OES) +GL_ENUM(0x8514,GL_TEXTURE_BINDING_CUBE_MAP_OES) +GL_ENUM(0x8515,GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES) +GL_ENUM(0x8516,GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES) +GL_ENUM(0x8517,GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES) +GL_ENUM(0x8518,GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES) +GL_ENUM(0x8519,GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES) +GL_ENUM(0x851A,GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES) +GL_ENUM(0x851C,GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES) +GL_ENUM(0x8570,GL_COMBINE) +GL_ENUM(0x8571,GL_COMBINE_RGB) +GL_ENUM(0x8572,GL_COMBINE_ALPHA) +GL_ENUM(0x8573,GL_RGB_SCALE) +GL_ENUM(0x8574,GL_ADD_SIGNED) +GL_ENUM(0x8575,GL_INTERPOLATE) +GL_ENUM(0x8576,GL_CONSTANT) +GL_ENUM(0x8577,GL_PRIMARY_COLOR) +GL_ENUM(0x8578,GL_PREVIOUS) +GL_ENUM(0x8580,GL_SRC0_RGB) +GL_ENUM(0x8581,GL_SRC1_RGB) +GL_ENUM(0x8582,GL_SRC2_RGB) +GL_ENUM(0x8588,GL_SRC0_ALPHA) +GL_ENUM(0x8589,GL_SRC1_ALPHA) +GL_ENUM(0x858A,GL_SRC2_ALPHA) +GL_ENUM(0x8590,GL_OPERAND0_RGB) +GL_ENUM(0x8591,GL_OPERAND1_RGB) +GL_ENUM(0x8592,GL_OPERAND2_RGB) +GL_ENUM(0x8598,GL_OPERAND0_ALPHA) +GL_ENUM(0x8599,GL_OPERAND1_ALPHA) +GL_ENUM(0x859A,GL_OPERAND2_ALPHA) +GL_ENUM(0x85B5,GL_VERTEX_ARRAY_BINDING_OES) +GL_ENUM(0x8622,GL_VERTEX_ATTRIB_ARRAY_ENABLED) +GL_ENUM(0x8623,GL_VERTEX_ATTRIB_ARRAY_SIZE) +GL_ENUM(0x8624,GL_VERTEX_ATTRIB_ARRAY_STRIDE) +GL_ENUM(0x8625,GL_VERTEX_ATTRIB_ARRAY_TYPE) +GL_ENUM(0x8626,GL_CURRENT_VERTEX_ATTRIB) +GL_ENUM(0x8645,GL_VERTEX_ATTRIB_ARRAY_POINTER) +GL_ENUM(0x86A2,GL_NUM_COMPRESSED_TEXTURE_FORMATS) +GL_ENUM(0x86A3,GL_COMPRESSED_TEXTURE_FORMATS) +GL_ENUM(0x86A4,GL_MAX_VERTEX_UNITS_OES) +GL_ENUM(0x86A9,GL_WEIGHT_ARRAY_TYPE_OES) +GL_ENUM(0x86AA,GL_WEIGHT_ARRAY_STRIDE_OES) +GL_ENUM(0x86AB,GL_WEIGHT_ARRAY_SIZE_OES) +GL_ENUM(0x86AC,GL_WEIGHT_ARRAY_POINTER_OES) +GL_ENUM(0x86AD,GL_WEIGHT_ARRAY_OES) +GL_ENUM(0x86AE,GL_DOT3_RGB) +GL_ENUM(0x86AF,GL_DOT3_RGBA) +GL_ENUM(0x8740,GL_Z400_BINARY_AMD) +GL_ENUM(0x8741,GL_PROGRAM_BINARY_LENGTH_OES) +GL_ENUM(0x8764,GL_BUFFER_SIZE) +GL_ENUM(0x8765,GL_BUFFER_USAGE) +GL_ENUM(0x87EE,GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD) +GL_ENUM(0x87F9,GL_3DC_X_AMD) +GL_ENUM(0x87FA,GL_3DC_XY_AMD) +GL_ENUM(0x87FE,GL_NUM_PROGRAM_BINARY_FORMATS_OES) +GL_ENUM(0x87FF,GL_PROGRAM_BINARY_FORMATS_OES) +GL_ENUM(0x8800,GL_STENCIL_BACK_FUNC) +GL_ENUM(0x8801,GL_STENCIL_BACK_FAIL) +GL_ENUM(0x8802,GL_STENCIL_BACK_PASS_DEPTH_FAIL) +GL_ENUM(0x8803,GL_STENCIL_BACK_PASS_DEPTH_PASS) +GL_ENUM(0x8823,GL_WRITEONLY_RENDERING_QCOM) +GL_ENUM(0x883D,GL_BLEND_EQUATION_ALPHA_OES) +GL_ENUM(0x8840,GL_MATRIX_PALETTE_OES) +GL_ENUM(0x8842,GL_MAX_PALETTE_MATRICES_OES) +GL_ENUM(0x8843,GL_CURRENT_PALETTE_MATRIX_OES) +GL_ENUM(0x8844,GL_MATRIX_INDEX_ARRAY_OES) +GL_ENUM(0x8846,GL_MATRIX_INDEX_ARRAY_SIZE_OES) +GL_ENUM(0x8847,GL_MATRIX_INDEX_ARRAY_TYPE_OES) +GL_ENUM(0x8848,GL_MATRIX_INDEX_ARRAY_STRIDE_OES) +GL_ENUM(0x8849,GL_MATRIX_INDEX_ARRAY_POINTER_OES) +GL_ENUM(0x8861,GL_POINT_SPRITE_OES) +GL_ENUM(0x8862,GL_COORD_REPLACE_OES) +GL_ENUM(0x8869,GL_MAX_VERTEX_ATTRIBS) +GL_ENUM(0x886A,GL_VERTEX_ATTRIB_ARRAY_NORMALIZED) +GL_ENUM(0x8872,GL_MAX_TEXTURE_IMAGE_UNITS) +GL_ENUM(0x8892,GL_ARRAY_BUFFER) +GL_ENUM(0x8893,GL_ELEMENT_ARRAY_BUFFER) +GL_ENUM(0x8894,GL_ARRAY_BUFFER_BINDING) +GL_ENUM(0x8895,GL_ELEMENT_ARRAY_BUFFER_BINDING) +GL_ENUM(0x8896,GL_VERTEX_ARRAY_BUFFER_BINDING) +GL_ENUM(0x8897,GL_NORMAL_ARRAY_BUFFER_BINDING) +GL_ENUM(0x8898,GL_COLOR_ARRAY_BUFFER_BINDING) +GL_ENUM(0x889A,GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING) +GL_ENUM(0x889E,GL_WEIGHT_ARRAY_BUFFER_BINDING_OES) +GL_ENUM(0x889F,GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) +GL_ENUM(0x88B9,GL_WRITE_ONLY_OES) +GL_ENUM(0x88BB,GL_BUFFER_ACCESS_OES) +GL_ENUM(0x88BC,GL_BUFFER_MAPPED_OES) +GL_ENUM(0x88BD,GL_BUFFER_MAP_POINTER_OES) +GL_ENUM(0x88E0,GL_STREAM_DRAW) +GL_ENUM(0x88E4,GL_STATIC_DRAW) +GL_ENUM(0x88E8,GL_DYNAMIC_DRAW) +GL_ENUM(0x88F0,GL_DEPTH24_STENCIL8_OES) +GL_ENUM(0x898A,GL_POINT_SIZE_ARRAY_TYPE_OES) +GL_ENUM(0x898B,GL_POINT_SIZE_ARRAY_STRIDE_OES) +GL_ENUM(0x898C,GL_POINT_SIZE_ARRAY_POINTER_OES) +GL_ENUM(0x898D,GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES) +GL_ENUM(0x898E,GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES) +GL_ENUM(0x898F,GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES) +GL_ENUM(0x8B30,GL_FRAGMENT_SHADER) +GL_ENUM(0x8B31,GL_VERTEX_SHADER) +GL_ENUM(0x8B4C,GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS) +GL_ENUM(0x8B4D,GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS) +GL_ENUM(0x8B4F,GL_SHADER_TYPE) +GL_ENUM(0x8B50,GL_FLOAT_VEC2) +GL_ENUM(0x8B51,GL_FLOAT_VEC3) +GL_ENUM(0x8B52,GL_FLOAT_VEC4) +GL_ENUM(0x8B53,GL_INT_VEC2) +GL_ENUM(0x8B54,GL_INT_VEC3) +GL_ENUM(0x8B55,GL_INT_VEC4) +GL_ENUM(0x8B56,GL_BOOL) +GL_ENUM(0x8B57,GL_BOOL_VEC2) +GL_ENUM(0x8B58,GL_BOOL_VEC3) +GL_ENUM(0x8B59,GL_BOOL_VEC4) +GL_ENUM(0x8B5A,GL_FLOAT_MAT2) +GL_ENUM(0x8B5B,GL_FLOAT_MAT3) +GL_ENUM(0x8B5C,GL_FLOAT_MAT4) +GL_ENUM(0x8B5E,GL_SAMPLER_2D) +GL_ENUM(0x8B5F,GL_SAMPLER_3D_OES) +GL_ENUM(0x8B60,GL_SAMPLER_CUBE) +GL_ENUM(0x8B80,GL_DELETE_STATUS) +GL_ENUM(0x8B81,GL_COMPILE_STATUS) +GL_ENUM(0x8B82,GL_LINK_STATUS) +GL_ENUM(0x8B83,GL_VALIDATE_STATUS) +GL_ENUM(0x8B84,GL_INFO_LOG_LENGTH) +GL_ENUM(0x8B85,GL_ATTACHED_SHADERS) +GL_ENUM(0x8B86,GL_ACTIVE_UNIFORMS) +GL_ENUM(0x8B87,GL_ACTIVE_UNIFORM_MAX_LENGTH) +GL_ENUM(0x8B88,GL_SHADER_SOURCE_LENGTH) +GL_ENUM(0x8B89,GL_ACTIVE_ATTRIBUTES) +GL_ENUM(0x8B8A,GL_ACTIVE_ATTRIBUTE_MAX_LENGTH) +GL_ENUM(0x8B8B,GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES) +GL_ENUM(0x8B8C,GL_SHADING_LANGUAGE_VERSION) +GL_ENUM(0x8B8D,GL_CURRENT_PROGRAM) +GL_ENUM(0x8B90,GL_PALETTE4_RGB8_OES) +GL_ENUM(0x8B91,GL_PALETTE4_RGBA8_OES) +GL_ENUM(0x8B92,GL_PALETTE4_R5_G6_B5_OES) +GL_ENUM(0x8B93,GL_PALETTE4_RGBA4_OES) +GL_ENUM(0x8B94,GL_PALETTE4_RGB5_A1_OES) +GL_ENUM(0x8B95,GL_PALETTE8_RGB8_OES) +GL_ENUM(0x8B96,GL_PALETTE8_RGBA8_OES) +GL_ENUM(0x8B97,GL_PALETTE8_R5_G6_B5_OES) +GL_ENUM(0x8B98,GL_PALETTE8_RGBA4_OES) +GL_ENUM(0x8B99,GL_PALETTE8_RGB5_A1_OES) +GL_ENUM(0x8B9A,GL_IMPLEMENTATION_COLOR_READ_TYPE_OES) +GL_ENUM(0x8B9B,GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES) +GL_ENUM(0x8B9C,GL_POINT_SIZE_ARRAY_OES) +GL_ENUM(0x8B9D,GL_TEXTURE_CROP_RECT_OES) +GL_ENUM(0x8B9E,GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES) +GL_ENUM(0x8B9F,GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES) +GL_ENUM(0x8BC0,GL_COUNTER_TYPE_AMD) +GL_ENUM(0x8BC1,GL_COUNTER_RANGE_AMD) +GL_ENUM(0x8BC2,GL_UNSIGNED_INT64_AMD) +GL_ENUM(0x8BC3,GL_PERCENTAGE_AMD) +GL_ENUM(0x8BC4,GL_PERFMON_RESULT_AVAILABLE_AMD) +GL_ENUM(0x8BC5,GL_PERFMON_RESULT_SIZE_AMD) +GL_ENUM(0x8BC6,GL_PERFMON_RESULT_AMD) +GL_ENUM(0x8BD2,GL_TEXTURE_WIDTH_QCOM) +GL_ENUM(0x8BD3,GL_TEXTURE_HEIGHT_QCOM) +GL_ENUM(0x8BD4,GL_TEXTURE_DEPTH_QCOM) +GL_ENUM(0x8BD5,GL_TEXTURE_INTERNAL_FORMAT_QCOM) +GL_ENUM(0x8BD6,GL_TEXTURE_FORMAT_QCOM) +GL_ENUM(0x8BD7,GL_TEXTURE_TYPE_QCOM) +GL_ENUM(0x8BD8,GL_TEXTURE_IMAGE_VALID_QCOM) +GL_ENUM(0x8BD9,GL_TEXTURE_NUM_LEVELS_QCOM) +GL_ENUM(0x8BDA,GL_TEXTURE_TARGET_QCOM) +GL_ENUM(0x8BDB,GL_TEXTURE_OBJECT_VALID_QCOM) +GL_ENUM(0x8BDC,GL_STATE_RESTORE) +GL_ENUM(0x8C00,GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG) +GL_ENUM(0x8C01,GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG) +GL_ENUM(0x8C02,GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG) +GL_ENUM(0x8C03,GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG) +GL_ENUM(0x8C04,GL_MODULATE_COLOR_IMG) +GL_ENUM(0x8C05,GL_RECIP_ADD_SIGNED_ALPHA_IMG) +GL_ENUM(0x8C06,GL_TEXTURE_ALPHA_MODULATE_IMG) +GL_ENUM(0x8C07,GL_FACTOR_ALPHA_MODULATE_IMG) +GL_ENUM(0x8C08,GL_FRAGMENT_ALPHA_MODULATE_IMG) +GL_ENUM(0x8C09,GL_ADD_BLEND_IMG) +GL_ENUM(0x8C0A,GL_SGX_BINARY_IMG) +GL_ENUM(0x8C92,GL_ATC_RGB_AMD) +GL_ENUM(0x8C93,GL_ATC_RGBA_EXPLICIT_ALPHA_AMD) +GL_ENUM(0x8CA3,GL_STENCIL_BACK_REF) +GL_ENUM(0x8CA4,GL_STENCIL_BACK_VALUE_MASK) +GL_ENUM(0x8CA5,GL_STENCIL_BACK_WRITEMASK) +GL_ENUM(0x8CA6,GL_FRAMEBUFFER_BINDING_OES) +GL_ENUM(0x8CA7,GL_RENDERBUFFER_BINDING_OES) +GL_ENUM(0x8CD0,GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES) +GL_ENUM(0x8CD1,GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES) +GL_ENUM(0x8CD2,GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES) +GL_ENUM(0x8CD3,GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES) +GL_ENUM(0x8CD4,GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES) +GL_ENUM(0x8CD5,GL_FRAMEBUFFER_COMPLETE_OES) +GL_ENUM(0x8CD6,GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES) +GL_ENUM(0x8CD7,GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES) +GL_ENUM(0x8CD9,GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES) +GL_ENUM(0x8CDA,GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES) +GL_ENUM(0x8CDD,GL_FRAMEBUFFER_UNSUPPORTED_OES) +GL_ENUM(0x8CE0,GL_COLOR_ATTACHMENT0_OES) +GL_ENUM(0x8D00,GL_DEPTH_ATTACHMENT_OES) +GL_ENUM(0x8D20,GL_STENCIL_ATTACHMENT_OES) +GL_ENUM(0x8D40,GL_FRAMEBUFFER_OES) +GL_ENUM(0x8D41,GL_RENDERBUFFER_OES) +GL_ENUM(0x8D42,GL_RENDERBUFFER_WIDTH_OES) +GL_ENUM(0x8D43,GL_RENDERBUFFER_HEIGHT_OES) +GL_ENUM(0x8D44,GL_RENDERBUFFER_INTERNAL_FORMAT_OES) +GL_ENUM(0x8D46,GL_STENCIL_INDEX1_OES) +GL_ENUM(0x8D47,GL_STENCIL_INDEX4_OES) +GL_ENUM(0x8D48,GL_STENCIL_INDEX8_OES) +GL_ENUM(0x8D50,GL_RENDERBUFFER_RED_SIZE_OES) +GL_ENUM(0x8D51,GL_RENDERBUFFER_GREEN_SIZE_OES) +GL_ENUM(0x8D52,GL_RENDERBUFFER_BLUE_SIZE_OES) +GL_ENUM(0x8D53,GL_RENDERBUFFER_ALPHA_SIZE_OES) +GL_ENUM(0x8D54,GL_RENDERBUFFER_DEPTH_SIZE_OES) +GL_ENUM(0x8D55,GL_RENDERBUFFER_STENCIL_SIZE_OES) +GL_ENUM(0x8D60,GL_TEXTURE_GEN_STR_OES) +GL_ENUM(0x8D61,GL_HALF_FLOAT_OES) +GL_ENUM(0x8D62,GL_RGB565_OES) +GL_ENUM(0x8D64,GL_ETC1_RGB8_OES) +GL_ENUM(0x8D65,GL_TEXTURE_EXTERNAL_OES) +GL_ENUM(0x8D66,GL_SAMPLER_EXTERNAL_OES) +GL_ENUM(0x8D67,GL_TEXTURE_BINDING_EXTERNAL_OES) +GL_ENUM(0x8D68,GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES) +GL_ENUM(0x8DF0,GL_LOW_FLOAT) +GL_ENUM(0x8DF1,GL_MEDIUM_FLOAT) +GL_ENUM(0x8DF2,GL_HIGH_FLOAT) +GL_ENUM(0x8DF3,GL_LOW_INT) +GL_ENUM(0x8DF4,GL_MEDIUM_INT) +GL_ENUM(0x8DF5,GL_HIGH_INT) +GL_ENUM(0x8DF6,GL_UNSIGNED_INT_10_10_10_2_OES) +GL_ENUM(0x8DF7,GL_INT_10_10_10_2_OES) +GL_ENUM(0x8DF8,GL_SHADER_BINARY_FORMATS) +GL_ENUM(0x8DF9,GL_NUM_SHADER_BINARY_FORMATS) +GL_ENUM(0x8DFA,GL_SHADER_COMPILER) +GL_ENUM(0x8DFB,GL_MAX_VERTEX_UNIFORM_VECTORS) +GL_ENUM(0x8DFC,GL_MAX_VARYING_VECTORS) +GL_ENUM(0x8DFD,GL_MAX_FRAGMENT_UNIFORM_VECTORS) +GL_ENUM(0x8E2C,GL_DEPTH_COMPONENT16_NONLINEAR_NV) +GL_ENUM(0x8ED0,GL_COVERAGE_COMPONENT_NV) +GL_ENUM(0x8ED1,GL_COVERAGE_COMPONENT4_NV) +GL_ENUM(0x8ED2,GL_COVERAGE_ATTACHMENT_NV) +GL_ENUM(0x8ED3,GL_COVERAGE_BUFFERS_NV) +GL_ENUM(0x8ED4,GL_COVERAGE_SAMPLES_NV) +GL_ENUM(0x8ED5,GL_COVERAGE_ALL_FRAGMENTS_NV) +GL_ENUM(0x8ED6,GL_COVERAGE_EDGE_FRAGMENTS_NV) +GL_ENUM(0x8ED7,GL_COVERAGE_AUTOMATIC_NV) +GL_ENUM(0x8FA0,GL_PERFMON_GLOBAL_MODE_QCOM) +GL_ENUM(0x9130,GL_SGX_PROGRAM_BINARY_IMG) +GL_ENUM(0x9133,GL_RENDERBUFFER_SAMPLES_IMG) +GL_ENUM(0x9134,GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG) +GL_ENUM(0x9135,GL_MAX_SAMPLES_IMG) +GL_ENUM(0x9136,GL_TEXTURE_SAMPLES_IMG) diff --git a/opengl/libs/hooks.h b/opengl/libs/hooks.h index 1ab58cc83349..812e26d10cb8 100644 --- a/opengl/libs/hooks.h +++ b/opengl/libs/hooks.h @@ -141,6 +141,11 @@ static gl_hooks_t const* getGlThreadSpecific() { #endif +#if EGL_TRACE + +extern gl_hooks_t const* getGLTraceThreadSpecific(); + +#endif // ---------------------------------------------------------------------------- }; // namespace android diff --git a/opengl/libs/tools/genfiles b/opengl/libs/tools/genfiles index 120cb4be8699..50bbf08441f7 100755 --- a/opengl/libs/tools/genfiles +++ b/opengl/libs/tools/genfiles @@ -31,3 +31,14 @@ cat /tmp/gl_entries.in \ | sort -t, -k2 \ | awk -F, '!_[$2]++' \ > ../entries.in + +./gltracegen ../entries.in >../trace.in + +cat ../../include/GLES/gl.h \ + ../../include/GLES/glext.h \ + ../../include/GLES2/gl2.h \ + ../../include/GLES2/gl2ext.h \ + | ./glenumsgen \ + | sort \ + > ../enums.in + diff --git a/opengl/libs/tools/glenumsgen b/opengl/libs/tools/glenumsgen new file mode 100755 index 000000000000..2ae5fbfa258d --- /dev/null +++ b/opengl/libs/tools/glenumsgen @@ -0,0 +1,38 @@ +#! /usr/bin/perl +# +# Copyright (C) 2010 Google Inc. +# +# 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. + +use strict; + +my %enumHash = (); + +while (my $line = <STDIN>) { + next if $line =~ /^\//; + # Skip bitfield definitions. + next if $line =~ /_BIT(\d+_|\s+)/; + if ($line !~ /^#define\s+(\S+)\s+(0x\S+)/) { + next; + } + my $enumName = $1; + my $enumValue = $2; + next if exists($enumHash { $enumValue }); + $enumHash { $enumValue } = $enumName; + printf("GL_ENUM(%s,%s)\n", $enumValue, $enumName); +} + + + + + diff --git a/opengl/libs/tools/gltracegen b/opengl/libs/tools/gltracegen new file mode 100755 index 000000000000..da42653e64d6 --- /dev/null +++ b/opengl/libs/tools/gltracegen @@ -0,0 +1,95 @@ +#! /usr/bin/perl +# +# Copyright (C) 2010 Google Inc. +# +# 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. + +use strict; + +sub rtrim($) +{ + my $string = shift; + $string =~ s/\s+$//; + return $string; +} + +while (my $line = <>) { + next if $line =~ /^\//; + next if $line =~ /^#/; + next if $line =~ /^\s*$/; + if ($line !~ /^GL_ENTRY\(([^,]+), ([^,]+), ([^\)]+)\)/) { + next; + } + my $type = $1; + my $name = $2; + my $args = $3; + + my @args = split ',', $args; + my $len = scalar(@args); + my $nonVoidArgLen = 0; + for (my $num = 0; $num < $len; $num++) { + if ($args[$num] ne "void") { + $nonVoidArgLen++; + } + } + if ($type eq "void") { + printf("TRACE_GL_VOID("); + } else { + printf("TRACE_GL(%s, ", $type); + } + + printf("%s, (%s), (", $name, $args); + for (my $num = 0; $num < $len; $num++) { + if ($args[$num] ne "void") { + if ($num > 0) { + print ", "; + } + # + # extract the name from the parameter + # type name + # const type *name + # type *name + # type name[4] + # + if ($args[$num] =~ /(\S+\s)+\**\s*([\w]+)/) { + printf("%s", $2); + } + } + } + printf("), %d", $nonVoidArgLen); + for (my $num = 0; $num < $len; $num++) { + if ($args[$num] ne "void") { + # + # extract the name from the parameter + # type name + # const type *name + # type *name + # type name[4] + # + my $arg = $args[$num]; + if ($arg =~ /(\S+\s)+\**\s*([\w]+)/) { + my $name = $2; + if ($arg =~ /((const )*(\S+\s)+\**)\s*([\w]+)/) { + my $type = rtrim($1); + printf(", \"%s\", %s", $type, $name); + } + } + } + } + printf(")\n"); +} + + + + + diff --git a/opengl/libs/trace.in b/opengl/libs/trace.in new file mode 100644 index 000000000000..3d492af4ee93 --- /dev/null +++ b/opengl/libs/trace.in @@ -0,0 +1,376 @@ +TRACE_GL_VOID(glActiveTexture, (GLenum texture), (texture), 1, "GLenum", texture) +TRACE_GL_VOID(glAlphaFunc, (GLenum func, GLclampf ref), (func, ref), 2, "GLenum", func, "GLclampf", ref) +TRACE_GL_VOID(glAlphaFuncx, (GLenum func, GLclampx ref), (func, ref), 2, "GLenum", func, "GLclampx", ref) +TRACE_GL_VOID(glAlphaFuncxOES, (GLenum func, GLclampx ref), (func, ref), 2, "GLenum", func, "GLclampx", ref) +TRACE_GL_VOID(glAttachShader, (GLuint program, GLuint shader), (program, shader), 2, "GLuint", program, "GLuint", shader) +TRACE_GL_VOID(glBeginPerfMonitorAMD, (GLuint monitor), (monitor), 1, "GLuint", monitor) +TRACE_GL_VOID(glBindAttribLocation, (GLuint program, GLuint index, const GLchar* name), (program, index, name), 3, "GLuint", program, "GLuint", index, "const GLchar*", name) +TRACE_GL_VOID(glBindBuffer, (GLenum target, GLuint buffer), (target, buffer), 2, "GLenum", target, "GLuint", buffer) +TRACE_GL_VOID(glBindFramebuffer, (GLenum target, GLuint framebuffer), (target, framebuffer), 2, "GLenum", target, "GLuint", framebuffer) +TRACE_GL_VOID(glBindFramebufferOES, (GLenum target, GLuint framebuffer), (target, framebuffer), 2, "GLenum", target, "GLuint", framebuffer) +TRACE_GL_VOID(glBindRenderbuffer, (GLenum target, GLuint renderbuffer), (target, renderbuffer), 2, "GLenum", target, "GLuint", renderbuffer) +TRACE_GL_VOID(glBindRenderbufferOES, (GLenum target, GLuint renderbuffer), (target, renderbuffer), 2, "GLenum", target, "GLuint", renderbuffer) +TRACE_GL_VOID(glBindTexture, (GLenum target, GLuint texture), (target, texture), 2, "GLenum", target, "GLuint", texture) +TRACE_GL_VOID(glBindVertexArrayOES, (GLuint array), (array), 1, "GLuint", array) +TRACE_GL_VOID(glBlendColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha), (red, green, blue, alpha), 4, "GLclampf", red, "GLclampf", green, "GLclampf", blue, "GLclampf", alpha) +TRACE_GL_VOID(glBlendEquation, ( GLenum mode ), (mode), 1, "GLenum", mode) +TRACE_GL_VOID(glBlendEquationOES, (GLenum mode), (mode), 1, "GLenum", mode) +TRACE_GL_VOID(glBlendEquationSeparate, (GLenum modeRGB, GLenum modeAlpha), (modeRGB, modeAlpha), 2, "GLenum", modeRGB, "GLenum", modeAlpha) +TRACE_GL_VOID(glBlendEquationSeparateOES, (GLenum modeRGB, GLenum modeAlpha), (modeRGB, modeAlpha), 2, "GLenum", modeRGB, "GLenum", modeAlpha) +TRACE_GL_VOID(glBlendFunc, (GLenum sfactor, GLenum dfactor), (sfactor, dfactor), 2, "GLenum", sfactor, "GLenum", dfactor) +TRACE_GL_VOID(glBlendFuncSeparate, (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha), (srcRGB, dstRGB, srcAlpha, dstAlpha), 4, "GLenum", srcRGB, "GLenum", dstRGB, "GLenum", srcAlpha, "GLenum", dstAlpha) +TRACE_GL_VOID(glBlendFuncSeparateOES, (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha), (srcRGB, dstRGB, srcAlpha, dstAlpha), 4, "GLenum", srcRGB, "GLenum", dstRGB, "GLenum", srcAlpha, "GLenum", dstAlpha) +TRACE_GL_VOID(glBufferData, (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage), (target, size, data, usage), 4, "GLenum", target, "GLsizeiptr", size, "const GLvoid *", data, "GLenum", usage) +TRACE_GL_VOID(glBufferSubData, (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data), (target, offset, size, data), 4, "GLenum", target, "GLintptr", offset, "GLsizeiptr", size, "const GLvoid *", data) +TRACE_GL(GLenum, glCheckFramebufferStatus, (GLenum target), (target), 1, "GLenum", target) +TRACE_GL(GLenum, glCheckFramebufferStatusOES, (GLenum target), (target), 1, "GLenum", target) +TRACE_GL_VOID(glClear, (GLbitfield mask), (mask), 1, "GLbitfield", mask) +TRACE_GL_VOID(glClearColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha), (red, green, blue, alpha), 4, "GLclampf", red, "GLclampf", green, "GLclampf", blue, "GLclampf", alpha) +TRACE_GL_VOID(glClearColorx, (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha), (red, green, blue, alpha), 4, "GLclampx", red, "GLclampx", green, "GLclampx", blue, "GLclampx", alpha) +TRACE_GL_VOID(glClearColorxOES, (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha), (red, green, blue, alpha), 4, "GLclampx", red, "GLclampx", green, "GLclampx", blue, "GLclampx", alpha) +TRACE_GL_VOID(glClearDepthf, (GLclampf depth), (depth), 1, "GLclampf", depth) +TRACE_GL_VOID(glClearDepthfOES, (GLclampf depth), (depth), 1, "GLclampf", depth) +TRACE_GL_VOID(glClearDepthx, (GLclampx depth), (depth), 1, "GLclampx", depth) +TRACE_GL_VOID(glClearDepthxOES, (GLclampx depth), (depth), 1, "GLclampx", depth) +TRACE_GL_VOID(glClearStencil, (GLint s), (s), 1, "GLint", s) +TRACE_GL_VOID(glClientActiveTexture, (GLenum texture), (texture), 1, "GLenum", texture) +TRACE_GL_VOID(glClipPlanef, (GLenum plane, const GLfloat *equation), (plane, equation), 2, "GLenum", plane, "const GLfloat *", equation) +TRACE_GL_VOID(glClipPlanefIMG, (GLenum p, const GLfloat *eqn), (p, eqn), 2, "GLenum", p, "const GLfloat *", eqn) +TRACE_GL_VOID(glClipPlanefOES, (GLenum plane, const GLfloat *equation), (plane, equation), 2, "GLenum", plane, "const GLfloat *", equation) +TRACE_GL_VOID(glClipPlanex, (GLenum plane, const GLfixed *equation), (plane, equation), 2, "GLenum", plane, "const GLfixed *", equation) +TRACE_GL_VOID(glClipPlanexIMG, (GLenum p, const GLfixed *eqn), (p, eqn), 2, "GLenum", p, "const GLfixed *", eqn) +TRACE_GL_VOID(glClipPlanexOES, (GLenum plane, const GLfixed *equation), (plane, equation), 2, "GLenum", plane, "const GLfixed *", equation) +TRACE_GL_VOID(glColor4f, (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha), (red, green, blue, alpha), 4, "GLfloat", red, "GLfloat", green, "GLfloat", blue, "GLfloat", alpha) +TRACE_GL_VOID(glColor4ub, (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha), (red, green, blue, alpha), 4, "GLubyte", red, "GLubyte", green, "GLubyte", blue, "GLubyte", alpha) +TRACE_GL_VOID(glColor4x, (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha), (red, green, blue, alpha), 4, "GLfixed", red, "GLfixed", green, "GLfixed", blue, "GLfixed", alpha) +TRACE_GL_VOID(glColor4xOES, (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha), (red, green, blue, alpha), 4, "GLfixed", red, "GLfixed", green, "GLfixed", blue, "GLfixed", alpha) +TRACE_GL_VOID(glColorMask, (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha), (red, green, blue, alpha), 4, "GLboolean", red, "GLboolean", green, "GLboolean", blue, "GLboolean", alpha) +TRACE_GL_VOID(glColorPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer), (size, type, stride, pointer), 4, "GLint", size, "GLenum", type, "GLsizei", stride, "const GLvoid *", pointer) +TRACE_GL_VOID(glCompileShader, (GLuint shader), (shader), 1, "GLuint", shader) +TRACE_GL_VOID(glCompressedTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data), (target, level, internalformat, width, height, border, imageSize, data), 8, "GLenum", target, "GLint", level, "GLenum", internalformat, "GLsizei", width, "GLsizei", height, "GLint", border, "GLsizei", imageSize, "const GLvoid *", data) +TRACE_GL_VOID(glCompressedTexImage3DOES, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data), (target, level, internalformat, width, height, depth, border, imageSize, data), 9, "GLenum", target, "GLint", level, "GLenum", internalformat, "GLsizei", width, "GLsizei", height, "GLsizei", depth, "GLint", border, "GLsizei", imageSize, "const GLvoid*", data) +TRACE_GL_VOID(glCompressedTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data), (target, level, xoffset, yoffset, width, height, format, imageSize, data), 9, "GLenum", target, "GLint", level, "GLint", xoffset, "GLint", yoffset, "GLsizei", width, "GLsizei", height, "GLenum", format, "GLsizei", imageSize, "const GLvoid *", data) +TRACE_GL_VOID(glCompressedTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data), (target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data), 11, "GLenum", target, "GLint", level, "GLint", xoffset, "GLint", yoffset, "GLint", zoffset, "GLsizei", width, "GLsizei", height, "GLsizei", depth, "GLenum", format, "GLsizei", imageSize, "const GLvoid*", data) +TRACE_GL_VOID(glCopyTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border), (target, level, internalformat, x, y, width, height, border), 8, "GLenum", target, "GLint", level, "GLenum", internalformat, "GLint", x, "GLint", y, "GLsizei", width, "GLsizei", height, "GLint", border) +TRACE_GL_VOID(glCopyTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height), (target, level, xoffset, yoffset, x, y, width, height), 8, "GLenum", target, "GLint", level, "GLint", xoffset, "GLint", yoffset, "GLint", x, "GLint", y, "GLsizei", width, "GLsizei", height) +TRACE_GL_VOID(glCopyTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height), (target, level, xoffset, yoffset, zoffset, x, y, width, height), 9, "GLenum", target, "GLint", level, "GLint", xoffset, "GLint", yoffset, "GLint", zoffset, "GLint", x, "GLint", y, "GLsizei", width, "GLsizei", height) +TRACE_GL_VOID(glCoverageMaskNV, (GLboolean mask), (mask), 1, "GLboolean", mask) +TRACE_GL_VOID(glCoverageOperationNV, (GLenum operation), (operation), 1, "GLenum", operation) +TRACE_GL(GLuint, glCreateProgram, (void), (), 0) +TRACE_GL(GLuint, glCreateShader, (GLenum type), (type), 1, "GLenum", type) +TRACE_GL_VOID(glCullFace, (GLenum mode), (mode), 1, "GLenum", mode) +TRACE_GL_VOID(glCurrentPaletteMatrixOES, (GLuint matrixpaletteindex), (matrixpaletteindex), 1, "GLuint", matrixpaletteindex) +TRACE_GL_VOID(glDeleteBuffers, (GLsizei n, const GLuint *buffers), (n, buffers), 2, "GLsizei", n, "const GLuint *", buffers) +TRACE_GL_VOID(glDeleteFencesNV, (GLsizei n, const GLuint *fences), (n, fences), 2, "GLsizei", n, "const GLuint *", fences) +TRACE_GL_VOID(glDeleteFramebuffers, (GLsizei n, const GLuint* framebuffers), (n, framebuffers), 2, "GLsizei", n, "const GLuint*", framebuffers) +TRACE_GL_VOID(glDeleteFramebuffersOES, (GLsizei n, const GLuint* framebuffers), (n, framebuffers), 2, "GLsizei", n, "const GLuint*", framebuffers) +TRACE_GL_VOID(glDeletePerfMonitorsAMD, (GLsizei n, GLuint *monitors), (n, monitors), 2, "GLsizei", n, "GLuint *", monitors) +TRACE_GL_VOID(glDeleteProgram, (GLuint program), (program), 1, "GLuint", program) +TRACE_GL_VOID(glDeleteRenderbuffers, (GLsizei n, const GLuint* renderbuffers), (n, renderbuffers), 2, "GLsizei", n, "const GLuint*", renderbuffers) +TRACE_GL_VOID(glDeleteRenderbuffersOES, (GLsizei n, const GLuint* renderbuffers), (n, renderbuffers), 2, "GLsizei", n, "const GLuint*", renderbuffers) +TRACE_GL_VOID(glDeleteShader, (GLuint shader), (shader), 1, "GLuint", shader) +TRACE_GL_VOID(glDeleteTextures, (GLsizei n, const GLuint *textures), (n, textures), 2, "GLsizei", n, "const GLuint *", textures) +TRACE_GL_VOID(glDeleteVertexArraysOES, (GLsizei n, const GLuint *arrays), (n, arrays), 2, "GLsizei", n, "const GLuint *", arrays) +TRACE_GL_VOID(glDepthFunc, (GLenum func), (func), 1, "GLenum", func) +TRACE_GL_VOID(glDepthMask, (GLboolean flag), (flag), 1, "GLboolean", flag) +TRACE_GL_VOID(glDepthRangef, (GLclampf zNear, GLclampf zFar), (zNear, zFar), 2, "GLclampf", zNear, "GLclampf", zFar) +TRACE_GL_VOID(glDepthRangefOES, (GLclampf zNear, GLclampf zFar), (zNear, zFar), 2, "GLclampf", zNear, "GLclampf", zFar) +TRACE_GL_VOID(glDepthRangex, (GLclampx zNear, GLclampx zFar), (zNear, zFar), 2, "GLclampx", zNear, "GLclampx", zFar) +TRACE_GL_VOID(glDepthRangexOES, (GLclampx zNear, GLclampx zFar), (zNear, zFar), 2, "GLclampx", zNear, "GLclampx", zFar) +TRACE_GL_VOID(glDetachShader, (GLuint program, GLuint shader), (program, shader), 2, "GLuint", program, "GLuint", shader) +TRACE_GL_VOID(glDisable, (GLenum cap), (cap), 1, "GLenum", cap) +TRACE_GL_VOID(glDisableClientState, (GLenum array), (array), 1, "GLenum", array) +TRACE_GL_VOID(glDisableDriverControlQCOM, (GLuint driverControl), (driverControl), 1, "GLuint", driverControl) +TRACE_GL_VOID(glDisableVertexAttribArray, (GLuint index), (index), 1, "GLuint", index) +TRACE_GL_VOID(glDiscardFramebufferEXT, (GLenum target, GLsizei numAttachments, const GLenum *attachments), (target, numAttachments, attachments), 3, "GLenum", target, "GLsizei", numAttachments, "const GLenum *", attachments) +TRACE_GL_VOID(glDrawArrays, (GLenum mode, GLint first, GLsizei count), (mode, first, count), 3, "GLenum", mode, "GLint", first, "GLsizei", count) +TRACE_GL_VOID(glDrawElements, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices), (mode, count, type, indices), 4, "GLenum", mode, "GLsizei", count, "GLenum", type, "const GLvoid *", indices) +TRACE_GL_VOID(glDrawTexfOES, (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height), (x, y, z, width, height), 5, "GLfloat", x, "GLfloat", y, "GLfloat", z, "GLfloat", width, "GLfloat", height) +TRACE_GL_VOID(glDrawTexfvOES, (const GLfloat *coords), (coords), 1, "const GLfloat *", coords) +TRACE_GL_VOID(glDrawTexiOES, (GLint x, GLint y, GLint z, GLint width, GLint height), (x, y, z, width, height), 5, "GLint", x, "GLint", y, "GLint", z, "GLint", width, "GLint", height) +TRACE_GL_VOID(glDrawTexivOES, (const GLint *coords), (coords), 1, "const GLint *", coords) +TRACE_GL_VOID(glDrawTexsOES, (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height), (x, y, z, width, height), 5, "GLshort", x, "GLshort", y, "GLshort", z, "GLshort", width, "GLshort", height) +TRACE_GL_VOID(glDrawTexsvOES, (const GLshort *coords), (coords), 1, "const GLshort *", coords) +TRACE_GL_VOID(glDrawTexxOES, (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height), (x, y, z, width, height), 5, "GLfixed", x, "GLfixed", y, "GLfixed", z, "GLfixed", width, "GLfixed", height) +TRACE_GL_VOID(glDrawTexxvOES, (const GLfixed *coords), (coords), 1, "const GLfixed *", coords) +TRACE_GL_VOID(glEGLImageTargetRenderbufferStorageOES, (GLenum target, GLeglImageOES image), (target, image), 2, "GLenum", target, "GLeglImageOES", image) +TRACE_GL_VOID(glEGLImageTargetTexture2DOES, (GLenum target, GLeglImageOES image), (target, image), 2, "GLenum", target, "GLeglImageOES", image) +TRACE_GL_VOID(glEnable, (GLenum cap), (cap), 1, "GLenum", cap) +TRACE_GL_VOID(glEnableClientState, (GLenum array), (array), 1, "GLenum", array) +TRACE_GL_VOID(glEnableDriverControlQCOM, (GLuint driverControl), (driverControl), 1, "GLuint", driverControl) +TRACE_GL_VOID(glEnableVertexAttribArray, (GLuint index), (index), 1, "GLuint", index) +TRACE_GL_VOID(glEndPerfMonitorAMD, (GLuint monitor), (monitor), 1, "GLuint", monitor) +TRACE_GL_VOID(glEndTilingQCOM, (GLbitfield preserveMask), (preserveMask), 1, "GLbitfield", preserveMask) +TRACE_GL_VOID(glExtGetBufferPointervQCOM, (GLenum target, GLvoid **params), (target, params), 2, "GLenum", target, "GLvoid **", params) +TRACE_GL_VOID(glExtGetBuffersQCOM, (GLuint *buffers, GLint maxBuffers, GLint *numBuffers), (buffers, maxBuffers, numBuffers), 3, "GLuint *", buffers, "GLint", maxBuffers, "GLint *", numBuffers) +TRACE_GL_VOID(glExtGetFramebuffersQCOM, (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers), (framebuffers, maxFramebuffers, numFramebuffers), 3, "GLuint *", framebuffers, "GLint", maxFramebuffers, "GLint *", numFramebuffers) +TRACE_GL_VOID(glExtGetProgramBinarySourceQCOM, (GLuint program, GLenum shadertype, GLchar *source, GLint *length), (program, shadertype, source, length), 4, "GLuint", program, "GLenum", shadertype, "GLchar *", source, "GLint *", length) +TRACE_GL_VOID(glExtGetProgramsQCOM, (GLuint *programs, GLint maxPrograms, GLint *numPrograms), (programs, maxPrograms, numPrograms), 3, "GLuint *", programs, "GLint", maxPrograms, "GLint *", numPrograms) +TRACE_GL_VOID(glExtGetRenderbuffersQCOM, (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers), (renderbuffers, maxRenderbuffers, numRenderbuffers), 3, "GLuint *", renderbuffers, "GLint", maxRenderbuffers, "GLint *", numRenderbuffers) +TRACE_GL_VOID(glExtGetShadersQCOM, (GLuint *shaders, GLint maxShaders, GLint *numShaders), (shaders, maxShaders, numShaders), 3, "GLuint *", shaders, "GLint", maxShaders, "GLint *", numShaders) +TRACE_GL_VOID(glExtGetTexLevelParameterivQCOM, (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params), (texture, face, level, pname, params), 5, "GLuint", texture, "GLenum", face, "GLint", level, "GLenum", pname, "GLint *", params) +TRACE_GL_VOID(glExtGetTexSubImageQCOM, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels), (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, texels), 11, "GLenum", target, "GLint", level, "GLint", xoffset, "GLint", yoffset, "GLint", zoffset, "GLsizei", width, "GLsizei", height, "GLsizei", depth, "GLenum", format, "GLenum", type, "GLvoid *", texels) +TRACE_GL_VOID(glExtGetTexturesQCOM, (GLuint *textures, GLint maxTextures, GLint *numTextures), (textures, maxTextures, numTextures), 3, "GLuint *", textures, "GLint", maxTextures, "GLint *", numTextures) +TRACE_GL(GLboolean, glExtIsProgramBinaryQCOM, (GLuint program), (program), 1, "GLuint", program) +TRACE_GL_VOID(glExtTexObjectStateOverrideiQCOM, (GLenum target, GLenum pname, GLint param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLint", param) +TRACE_GL_VOID(glFinish, (void), (), 0) +TRACE_GL_VOID(glFinishFenceNV, (GLuint fence), (fence), 1, "GLuint", fence) +TRACE_GL_VOID(glFlush, (void), (), 0) +TRACE_GL_VOID(glFogf, (GLenum pname, GLfloat param), (pname, param), 2, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glFogfv, (GLenum pname, const GLfloat *params), (pname, params), 2, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glFogx, (GLenum pname, GLfixed param), (pname, param), 2, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glFogxOES, (GLenum pname, GLfixed param), (pname, param), 2, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glFogxv, (GLenum pname, const GLfixed *params), (pname, params), 2, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glFogxvOES, (GLenum pname, const GLfixed *params), (pname, params), 2, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glFramebufferRenderbuffer, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer), (target, attachment, renderbuffertarget, renderbuffer), 4, "GLenum", target, "GLenum", attachment, "GLenum", renderbuffertarget, "GLuint", renderbuffer) +TRACE_GL_VOID(glFramebufferRenderbufferOES, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer), (target, attachment, renderbuffertarget, renderbuffer), 4, "GLenum", target, "GLenum", attachment, "GLenum", renderbuffertarget, "GLuint", renderbuffer) +TRACE_GL_VOID(glFramebufferTexture2D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level), (target, attachment, textarget, texture, level), 5, "GLenum", target, "GLenum", attachment, "GLenum", textarget, "GLuint", texture, "GLint", level) +TRACE_GL_VOID(glFramebufferTexture2DMultisampleIMG, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples), (target, attachment, textarget, texture, level, samples), 6, "GLenum", target, "GLenum", attachment, "GLenum", textarget, "GLuint", texture, "GLint", level, "GLsizei", samples) +TRACE_GL_VOID(glFramebufferTexture2DOES, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level), (target, attachment, textarget, texture, level), 5, "GLenum", target, "GLenum", attachment, "GLenum", textarget, "GLuint", texture, "GLint", level) +TRACE_GL_VOID(glFramebufferTexture3DOES, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset), (target, attachment, textarget, texture, level, zoffset), 6, "GLenum", target, "GLenum", attachment, "GLenum", textarget, "GLuint", texture, "GLint", level, "GLint", zoffset) +TRACE_GL_VOID(glFrontFace, (GLenum mode), (mode), 1, "GLenum", mode) +TRACE_GL_VOID(glFrustumf, (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfloat", left, "GLfloat", right, "GLfloat", bottom, "GLfloat", top, "GLfloat", zNear, "GLfloat", zFar) +TRACE_GL_VOID(glFrustumfOES, (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfloat", left, "GLfloat", right, "GLfloat", bottom, "GLfloat", top, "GLfloat", zNear, "GLfloat", zFar) +TRACE_GL_VOID(glFrustumx, (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfixed", left, "GLfixed", right, "GLfixed", bottom, "GLfixed", top, "GLfixed", zNear, "GLfixed", zFar) +TRACE_GL_VOID(glFrustumxOES, (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfixed", left, "GLfixed", right, "GLfixed", bottom, "GLfixed", top, "GLfixed", zNear, "GLfixed", zFar) +TRACE_GL_VOID(glGenBuffers, (GLsizei n, GLuint *buffers), (n, buffers), 2, "GLsizei", n, "GLuint *", buffers) +TRACE_GL_VOID(glGenFencesNV, (GLsizei n, GLuint *fences), (n, fences), 2, "GLsizei", n, "GLuint *", fences) +TRACE_GL_VOID(glGenFramebuffers, (GLsizei n, GLuint* framebuffers), (n, framebuffers), 2, "GLsizei", n, "GLuint*", framebuffers) +TRACE_GL_VOID(glGenFramebuffersOES, (GLsizei n, GLuint* framebuffers), (n, framebuffers), 2, "GLsizei", n, "GLuint*", framebuffers) +TRACE_GL_VOID(glGenPerfMonitorsAMD, (GLsizei n, GLuint *monitors), (n, monitors), 2, "GLsizei", n, "GLuint *", monitors) +TRACE_GL_VOID(glGenRenderbuffers, (GLsizei n, GLuint* renderbuffers), (n, renderbuffers), 2, "GLsizei", n, "GLuint*", renderbuffers) +TRACE_GL_VOID(glGenRenderbuffersOES, (GLsizei n, GLuint* renderbuffers), (n, renderbuffers), 2, "GLsizei", n, "GLuint*", renderbuffers) +TRACE_GL_VOID(glGenTextures, (GLsizei n, GLuint *textures), (n, textures), 2, "GLsizei", n, "GLuint *", textures) +TRACE_GL_VOID(glGenVertexArraysOES, (GLsizei n, GLuint *arrays), (n, arrays), 2, "GLsizei", n, "GLuint *", arrays) +TRACE_GL_VOID(glGenerateMipmap, (GLenum target), (target), 1, "GLenum", target) +TRACE_GL_VOID(glGenerateMipmapOES, (GLenum target), (target), 1, "GLenum", target) +TRACE_GL_VOID(glGetActiveAttrib, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name), (program, index, bufsize, length, size, type, name), 7, "GLuint", program, "GLuint", index, "GLsizei", bufsize, "GLsizei*", length, "GLint*", size, "GLenum*", type, "GLchar*", name) +TRACE_GL_VOID(glGetActiveUniform, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name), (program, index, bufsize, length, size, type, name), 7, "GLuint", program, "GLuint", index, "GLsizei", bufsize, "GLsizei*", length, "GLint*", size, "GLenum*", type, "GLchar*", name) +TRACE_GL_VOID(glGetAttachedShaders, (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders), (program, maxcount, count, shaders), 4, "GLuint", program, "GLsizei", maxcount, "GLsizei*", count, "GLuint*", shaders) +TRACE_GL(int, glGetAttribLocation, (GLuint program, const GLchar* name), (program, name), 2, "GLuint", program, "const GLchar*", name) +TRACE_GL_VOID(glGetBooleanv, (GLenum pname, GLboolean *params), (pname, params), 2, "GLenum", pname, "GLboolean *", params) +TRACE_GL_VOID(glGetBufferParameteriv, (GLenum target, GLenum pname, GLint *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLint *", params) +TRACE_GL_VOID(glGetBufferPointervOES, (GLenum target, GLenum pname, GLvoid ** params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLvoid **", params) +TRACE_GL_VOID(glGetClipPlanef, (GLenum pname, GLfloat eqn[4]), (pname, eqn), 2, "GLenum", pname, "GLfloat", eqn) +TRACE_GL_VOID(glGetClipPlanefOES, (GLenum pname, GLfloat eqn[4]), (pname, eqn), 2, "GLenum", pname, "GLfloat", eqn) +TRACE_GL_VOID(glGetClipPlanex, (GLenum pname, GLfixed eqn[4]), (pname, eqn), 2, "GLenum", pname, "GLfixed", eqn) +TRACE_GL_VOID(glGetClipPlanexOES, (GLenum pname, GLfixed eqn[4]), (pname, eqn), 2, "GLenum", pname, "GLfixed", eqn) +TRACE_GL_VOID(glGetDriverControlStringQCOM, (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString), (driverControl, bufSize, length, driverControlString), 4, "GLuint", driverControl, "GLsizei", bufSize, "GLsizei *", length, "GLchar *", driverControlString) +TRACE_GL_VOID(glGetDriverControlsQCOM, (GLint *num, GLsizei size, GLuint *driverControls), (num, size, driverControls), 3, "GLint *", num, "GLsizei", size, "GLuint *", driverControls) +TRACE_GL(GLenum, glGetError, (void), (), 0) +TRACE_GL_VOID(glGetFenceivNV, (GLuint fence, GLenum pname, GLint *params), (fence, pname, params), 3, "GLuint", fence, "GLenum", pname, "GLint *", params) +TRACE_GL_VOID(glGetFixedv, (GLenum pname, GLfixed *params), (pname, params), 2, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetFixedvOES, (GLenum pname, GLfixed *params), (pname, params), 2, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetFloatv, (GLenum pname, GLfloat *params), (pname, params), 2, "GLenum", pname, "GLfloat *", params) +TRACE_GL_VOID(glGetFramebufferAttachmentParameteriv, (GLenum target, GLenum attachment, GLenum pname, GLint* params), (target, attachment, pname, params), 4, "GLenum", target, "GLenum", attachment, "GLenum", pname, "GLint*", params) +TRACE_GL_VOID(glGetFramebufferAttachmentParameterivOES, (GLenum target, GLenum attachment, GLenum pname, GLint* params), (target, attachment, pname, params), 4, "GLenum", target, "GLenum", attachment, "GLenum", pname, "GLint*", params) +TRACE_GL_VOID(glGetIntegerv, (GLenum pname, GLint *params), (pname, params), 2, "GLenum", pname, "GLint *", params) +TRACE_GL_VOID(glGetLightfv, (GLenum light, GLenum pname, GLfloat *params), (light, pname, params), 3, "GLenum", light, "GLenum", pname, "GLfloat *", params) +TRACE_GL_VOID(glGetLightxv, (GLenum light, GLenum pname, GLfixed *params), (light, pname, params), 3, "GLenum", light, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetLightxvOES, (GLenum light, GLenum pname, GLfixed *params), (light, pname, params), 3, "GLenum", light, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetMaterialfv, (GLenum face, GLenum pname, GLfloat *params), (face, pname, params), 3, "GLenum", face, "GLenum", pname, "GLfloat *", params) +TRACE_GL_VOID(glGetMaterialxv, (GLenum face, GLenum pname, GLfixed *params), (face, pname, params), 3, "GLenum", face, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetMaterialxvOES, (GLenum face, GLenum pname, GLfixed *params), (face, pname, params), 3, "GLenum", face, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetPerfMonitorCounterDataAMD, (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten), (monitor, pname, dataSize, data, bytesWritten), 5, "GLuint", monitor, "GLenum", pname, "GLsizei", dataSize, "GLuint *", data, "GLint *", bytesWritten) +TRACE_GL_VOID(glGetPerfMonitorCounterInfoAMD, (GLuint group, GLuint counter, GLenum pname, GLvoid *data), (group, counter, pname, data), 4, "GLuint", group, "GLuint", counter, "GLenum", pname, "GLvoid *", data) +TRACE_GL_VOID(glGetPerfMonitorCounterStringAMD, (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString), (group, counter, bufSize, length, counterString), 5, "GLuint", group, "GLuint", counter, "GLsizei", bufSize, "GLsizei *", length, "GLchar *", counterString) +TRACE_GL_VOID(glGetPerfMonitorCountersAMD, (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters), (group, numCounters, maxActiveCounters, counterSize, counters), 5, "GLuint", group, "GLint *", numCounters, "GLint *", maxActiveCounters, "GLsizei", counterSize, "GLuint *", counters) +TRACE_GL_VOID(glGetPerfMonitorGroupStringAMD, (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString), (group, bufSize, length, groupString), 4, "GLuint", group, "GLsizei", bufSize, "GLsizei *", length, "GLchar *", groupString) +TRACE_GL_VOID(glGetPerfMonitorGroupsAMD, (GLint *numGroups, GLsizei groupsSize, GLuint *groups), (numGroups, groupsSize, groups), 3, "GLint *", numGroups, "GLsizei", groupsSize, "GLuint *", groups) +TRACE_GL_VOID(glGetPointerv, (GLenum pname, GLvoid **params), (pname, params), 2, "GLenum", pname, "GLvoid **", params) +TRACE_GL_VOID(glGetProgramBinaryOES, (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary), (program, bufSize, length, binaryFormat, binary), 5, "GLuint", program, "GLsizei", bufSize, "GLsizei *", length, "GLenum *", binaryFormat, "GLvoid *", binary) +TRACE_GL_VOID(glGetProgramInfoLog, (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog), (program, bufsize, length, infolog), 4, "GLuint", program, "GLsizei", bufsize, "GLsizei*", length, "GLchar*", infolog) +TRACE_GL_VOID(glGetProgramiv, (GLuint program, GLenum pname, GLint* params), (program, pname, params), 3, "GLuint", program, "GLenum", pname, "GLint*", params) +TRACE_GL_VOID(glGetRenderbufferParameteriv, (GLenum target, GLenum pname, GLint* params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLint*", params) +TRACE_GL_VOID(glGetRenderbufferParameterivOES, (GLenum target, GLenum pname, GLint* params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLint*", params) +TRACE_GL_VOID(glGetShaderInfoLog, (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog), (shader, bufsize, length, infolog), 4, "GLuint", shader, "GLsizei", bufsize, "GLsizei*", length, "GLchar*", infolog) +TRACE_GL_VOID(glGetShaderPrecisionFormat, (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision), (shadertype, precisiontype, range, precision), 4, "GLenum", shadertype, "GLenum", precisiontype, "GLint*", range, "GLint*", precision) +TRACE_GL_VOID(glGetShaderSource, (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source), (shader, bufsize, length, source), 4, "GLuint", shader, "GLsizei", bufsize, "GLsizei*", length, "GLchar*", source) +TRACE_GL_VOID(glGetShaderiv, (GLuint shader, GLenum pname, GLint* params), (shader, pname, params), 3, "GLuint", shader, "GLenum", pname, "GLint*", params) +TRACE_GL(const GLubyte *, glGetString, (GLenum name), (name), 1, "GLenum", name) +TRACE_GL_VOID(glGetTexEnvfv, (GLenum env, GLenum pname, GLfloat *params), (env, pname, params), 3, "GLenum", env, "GLenum", pname, "GLfloat *", params) +TRACE_GL_VOID(glGetTexEnviv, (GLenum env, GLenum pname, GLint *params), (env, pname, params), 3, "GLenum", env, "GLenum", pname, "GLint *", params) +TRACE_GL_VOID(glGetTexEnvxv, (GLenum env, GLenum pname, GLfixed *params), (env, pname, params), 3, "GLenum", env, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetTexEnvxvOES, (GLenum env, GLenum pname, GLfixed *params), (env, pname, params), 3, "GLenum", env, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetTexGenfvOES, (GLenum coord, GLenum pname, GLfloat *params), (coord, pname, params), 3, "GLenum", coord, "GLenum", pname, "GLfloat *", params) +TRACE_GL_VOID(glGetTexGenivOES, (GLenum coord, GLenum pname, GLint *params), (coord, pname, params), 3, "GLenum", coord, "GLenum", pname, "GLint *", params) +TRACE_GL_VOID(glGetTexGenxvOES, (GLenum coord, GLenum pname, GLfixed *params), (coord, pname, params), 3, "GLenum", coord, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetTexParameterfv, (GLenum target, GLenum pname, GLfloat *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLfloat *", params) +TRACE_GL_VOID(glGetTexParameteriv, (GLenum target, GLenum pname, GLint *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLint *", params) +TRACE_GL_VOID(glGetTexParameterxv, (GLenum target, GLenum pname, GLfixed *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLfixed *", params) +TRACE_GL_VOID(glGetTexParameterxvOES, (GLenum target, GLenum pname, GLfixed *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "GLfixed *", params) +TRACE_GL(int, glGetUniformLocation, (GLuint program, const GLchar* name), (program, name), 2, "GLuint", program, "const GLchar*", name) +TRACE_GL_VOID(glGetUniformfv, (GLuint program, GLint location, GLfloat* params), (program, location, params), 3, "GLuint", program, "GLint", location, "GLfloat*", params) +TRACE_GL_VOID(glGetUniformiv, (GLuint program, GLint location, GLint* params), (program, location, params), 3, "GLuint", program, "GLint", location, "GLint*", params) +TRACE_GL_VOID(glGetVertexAttribPointerv, (GLuint index, GLenum pname, GLvoid** pointer), (index, pname, pointer), 3, "GLuint", index, "GLenum", pname, "GLvoid**", pointer) +TRACE_GL_VOID(glGetVertexAttribfv, (GLuint index, GLenum pname, GLfloat* params), (index, pname, params), 3, "GLuint", index, "GLenum", pname, "GLfloat*", params) +TRACE_GL_VOID(glGetVertexAttribiv, (GLuint index, GLenum pname, GLint* params), (index, pname, params), 3, "GLuint", index, "GLenum", pname, "GLint*", params) +TRACE_GL_VOID(glHint, (GLenum target, GLenum mode), (target, mode), 2, "GLenum", target, "GLenum", mode) +TRACE_GL(GLboolean, glIsBuffer, (GLuint buffer), (buffer), 1, "GLuint", buffer) +TRACE_GL(GLboolean, glIsEnabled, (GLenum cap), (cap), 1, "GLenum", cap) +TRACE_GL(GLboolean, glIsFenceNV, (GLuint fence), (fence), 1, "GLuint", fence) +TRACE_GL(GLboolean, glIsFramebuffer, (GLuint framebuffer), (framebuffer), 1, "GLuint", framebuffer) +TRACE_GL(GLboolean, glIsFramebufferOES, (GLuint framebuffer), (framebuffer), 1, "GLuint", framebuffer) +TRACE_GL(GLboolean, glIsProgram, (GLuint program), (program), 1, "GLuint", program) +TRACE_GL(GLboolean, glIsRenderbuffer, (GLuint renderbuffer), (renderbuffer), 1, "GLuint", renderbuffer) +TRACE_GL(GLboolean, glIsRenderbufferOES, (GLuint renderbuffer), (renderbuffer), 1, "GLuint", renderbuffer) +TRACE_GL(GLboolean, glIsShader, (GLuint shader), (shader), 1, "GLuint", shader) +TRACE_GL(GLboolean, glIsTexture, (GLuint texture), (texture), 1, "GLuint", texture) +TRACE_GL(GLboolean, glIsVertexArrayOES, (GLuint array), (array), 1, "GLuint", array) +TRACE_GL_VOID(glLightModelf, (GLenum pname, GLfloat param), (pname, param), 2, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glLightModelfv, (GLenum pname, const GLfloat *params), (pname, params), 2, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glLightModelx, (GLenum pname, GLfixed param), (pname, param), 2, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glLightModelxOES, (GLenum pname, GLfixed param), (pname, param), 2, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glLightModelxv, (GLenum pname, const GLfixed *params), (pname, params), 2, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glLightModelxvOES, (GLenum pname, const GLfixed *params), (pname, params), 2, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glLightf, (GLenum light, GLenum pname, GLfloat param), (light, pname, param), 3, "GLenum", light, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glLightfv, (GLenum light, GLenum pname, const GLfloat *params), (light, pname, params), 3, "GLenum", light, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glLightx, (GLenum light, GLenum pname, GLfixed param), (light, pname, param), 3, "GLenum", light, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glLightxOES, (GLenum light, GLenum pname, GLfixed param), (light, pname, param), 3, "GLenum", light, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glLightxv, (GLenum light, GLenum pname, const GLfixed *params), (light, pname, params), 3, "GLenum", light, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glLightxvOES, (GLenum light, GLenum pname, const GLfixed *params), (light, pname, params), 3, "GLenum", light, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glLineWidth, (GLfloat width), (width), 1, "GLfloat", width) +TRACE_GL_VOID(glLineWidthx, (GLfixed width), (width), 1, "GLfixed", width) +TRACE_GL_VOID(glLineWidthxOES, (GLfixed width), (width), 1, "GLfixed", width) +TRACE_GL_VOID(glLinkProgram, (GLuint program), (program), 1, "GLuint", program) +TRACE_GL_VOID(glLoadIdentity, (void), (), 0) +TRACE_GL_VOID(glLoadMatrixf, (const GLfloat *m), (m), 1, "const GLfloat *", m) +TRACE_GL_VOID(glLoadMatrixx, (const GLfixed *m), (m), 1, "const GLfixed *", m) +TRACE_GL_VOID(glLoadMatrixxOES, (const GLfixed *m), (m), 1, "const GLfixed *", m) +TRACE_GL_VOID(glLoadPaletteFromModelViewMatrixOES, (void), (), 0) +TRACE_GL_VOID(glLogicOp, (GLenum opcode), (opcode), 1, "GLenum", opcode) +TRACE_GL(void*, glMapBufferOES, (GLenum target, GLenum access), (target, access), 2, "GLenum", target, "GLenum", access) +TRACE_GL_VOID(glMaterialf, (GLenum face, GLenum pname, GLfloat param), (face, pname, param), 3, "GLenum", face, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glMaterialfv, (GLenum face, GLenum pname, const GLfloat *params), (face, pname, params), 3, "GLenum", face, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glMaterialx, (GLenum face, GLenum pname, GLfixed param), (face, pname, param), 3, "GLenum", face, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glMaterialxOES, (GLenum face, GLenum pname, GLfixed param), (face, pname, param), 3, "GLenum", face, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glMaterialxv, (GLenum face, GLenum pname, const GLfixed *params), (face, pname, params), 3, "GLenum", face, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glMaterialxvOES, (GLenum face, GLenum pname, const GLfixed *params), (face, pname, params), 3, "GLenum", face, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glMatrixIndexPointerOES, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer), (size, type, stride, pointer), 4, "GLint", size, "GLenum", type, "GLsizei", stride, "const GLvoid *", pointer) +TRACE_GL_VOID(glMatrixMode, (GLenum mode), (mode), 1, "GLenum", mode) +TRACE_GL_VOID(glMultMatrixf, (const GLfloat *m), (m), 1, "const GLfloat *", m) +TRACE_GL_VOID(glMultMatrixx, (const GLfixed *m), (m), 1, "const GLfixed *", m) +TRACE_GL_VOID(glMultMatrixxOES, (const GLfixed *m), (m), 1, "const GLfixed *", m) +TRACE_GL_VOID(glMultiDrawArraysEXT, (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount), (mode, first, count, primcount), 4, "GLenum", mode, "GLint *", first, "GLsizei *", count, "GLsizei", primcount) +TRACE_GL_VOID(glMultiDrawElementsEXT, (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount), (mode, count, type, indices, primcount), 5, "GLenum", mode, "const GLsizei *", count, "GLenum", type, "const GLvoid* *", indices, "GLsizei", primcount) +TRACE_GL_VOID(glMultiTexCoord4f, (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q), (target, s, t, r, q), 5, "GLenum", target, "GLfloat", s, "GLfloat", t, "GLfloat", r, "GLfloat", q) +TRACE_GL_VOID(glMultiTexCoord4x, (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q), (target, s, t, r, q), 5, "GLenum", target, "GLfixed", s, "GLfixed", t, "GLfixed", r, "GLfixed", q) +TRACE_GL_VOID(glMultiTexCoord4xOES, (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q), (target, s, t, r, q), 5, "GLenum", target, "GLfixed", s, "GLfixed", t, "GLfixed", r, "GLfixed", q) +TRACE_GL_VOID(glNormal3f, (GLfloat nx, GLfloat ny, GLfloat nz), (nx, ny, nz), 3, "GLfloat", nx, "GLfloat", ny, "GLfloat", nz) +TRACE_GL_VOID(glNormal3x, (GLfixed nx, GLfixed ny, GLfixed nz), (nx, ny, nz), 3, "GLfixed", nx, "GLfixed", ny, "GLfixed", nz) +TRACE_GL_VOID(glNormal3xOES, (GLfixed nx, GLfixed ny, GLfixed nz), (nx, ny, nz), 3, "GLfixed", nx, "GLfixed", ny, "GLfixed", nz) +TRACE_GL_VOID(glNormalPointer, (GLenum type, GLsizei stride, const GLvoid *pointer), (type, stride, pointer), 3, "GLenum", type, "GLsizei", stride, "const GLvoid *", pointer) +TRACE_GL_VOID(glOrthof, (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfloat", left, "GLfloat", right, "GLfloat", bottom, "GLfloat", top, "GLfloat", zNear, "GLfloat", zFar) +TRACE_GL_VOID(glOrthofOES, (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfloat", left, "GLfloat", right, "GLfloat", bottom, "GLfloat", top, "GLfloat", zNear, "GLfloat", zFar) +TRACE_GL_VOID(glOrthox, (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfixed", left, "GLfixed", right, "GLfixed", bottom, "GLfixed", top, "GLfixed", zNear, "GLfixed", zFar) +TRACE_GL_VOID(glOrthoxOES, (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar), (left, right, bottom, top, zNear, zFar), 6, "GLfixed", left, "GLfixed", right, "GLfixed", bottom, "GLfixed", top, "GLfixed", zNear, "GLfixed", zFar) +TRACE_GL_VOID(glPixelStorei, (GLenum pname, GLint param), (pname, param), 2, "GLenum", pname, "GLint", param) +TRACE_GL_VOID(glPointParameterf, (GLenum pname, GLfloat param), (pname, param), 2, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glPointParameterfv, (GLenum pname, const GLfloat *params), (pname, params), 2, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glPointParameterx, (GLenum pname, GLfixed param), (pname, param), 2, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glPointParameterxOES, (GLenum pname, GLfixed param), (pname, param), 2, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glPointParameterxv, (GLenum pname, const GLfixed *params), (pname, params), 2, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glPointParameterxvOES, (GLenum pname, const GLfixed *params), (pname, params), 2, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glPointSize, (GLfloat size), (size), 1, "GLfloat", size) +TRACE_GL_VOID(glPointSizePointerOES, (GLenum type, GLsizei stride, const GLvoid *pointer), (type, stride, pointer), 3, "GLenum", type, "GLsizei", stride, "const GLvoid *", pointer) +TRACE_GL_VOID(glPointSizex, (GLfixed size), (size), 1, "GLfixed", size) +TRACE_GL_VOID(glPointSizexOES, (GLfixed size), (size), 1, "GLfixed", size) +TRACE_GL_VOID(glPolygonOffset, (GLfloat factor, GLfloat units), (factor, units), 2, "GLfloat", factor, "GLfloat", units) +TRACE_GL_VOID(glPolygonOffsetx, (GLfixed factor, GLfixed units), (factor, units), 2, "GLfixed", factor, "GLfixed", units) +TRACE_GL_VOID(glPolygonOffsetxOES, (GLfixed factor, GLfixed units), (factor, units), 2, "GLfixed", factor, "GLfixed", units) +TRACE_GL_VOID(glPopMatrix, (void), (), 0) +TRACE_GL_VOID(glProgramBinaryOES, (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length), (program, binaryFormat, binary, length), 4, "GLuint", program, "GLenum", binaryFormat, "const GLvoid *", binary, "GLint", length) +TRACE_GL_VOID(glPushMatrix, (void), (), 0) +TRACE_GL(GLbitfield, glQueryMatrixxOES, (GLfixed mantissa[16], GLint exponent[16]), (mantissa, exponent), 2, "GLfixed", mantissa, "GLint", exponent) +TRACE_GL_VOID(glReadPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels), (x, y, width, height, format, type, pixels), 7, "GLint", x, "GLint", y, "GLsizei", width, "GLsizei", height, "GLenum", format, "GLenum", type, "GLvoid *", pixels) +TRACE_GL_VOID(glReleaseShaderCompiler, (void), (), 0) +TRACE_GL_VOID(glRenderbufferStorage, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height), (target, internalformat, width, height), 4, "GLenum", target, "GLenum", internalformat, "GLsizei", width, "GLsizei", height) +TRACE_GL_VOID(glRenderbufferStorageMultisampleIMG, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height), (target, samples, internalformat, width, height), 5, "GLenum", target, "GLsizei", samples, "GLenum", internalformat, "GLsizei", width, "GLsizei", height) +TRACE_GL_VOID(glRenderbufferStorageOES, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height), (target, internalformat, width, height), 4, "GLenum", target, "GLenum", internalformat, "GLsizei", width, "GLsizei", height) +TRACE_GL_VOID(glRotatef, (GLfloat angle, GLfloat x, GLfloat y, GLfloat z), (angle, x, y, z), 4, "GLfloat", angle, "GLfloat", x, "GLfloat", y, "GLfloat", z) +TRACE_GL_VOID(glRotatex, (GLfixed angle, GLfixed x, GLfixed y, GLfixed z), (angle, x, y, z), 4, "GLfixed", angle, "GLfixed", x, "GLfixed", y, "GLfixed", z) +TRACE_GL_VOID(glRotatexOES, (GLfixed angle, GLfixed x, GLfixed y, GLfixed z), (angle, x, y, z), 4, "GLfixed", angle, "GLfixed", x, "GLfixed", y, "GLfixed", z) +TRACE_GL_VOID(glSampleCoverage, (GLclampf value, GLboolean invert), (value, invert), 2, "GLclampf", value, "GLboolean", invert) +TRACE_GL_VOID(glSampleCoveragex, (GLclampx value, GLboolean invert), (value, invert), 2, "GLclampx", value, "GLboolean", invert) +TRACE_GL_VOID(glSampleCoveragexOES, (GLclampx value, GLboolean invert), (value, invert), 2, "GLclampx", value, "GLboolean", invert) +TRACE_GL_VOID(glScalef, (GLfloat x, GLfloat y, GLfloat z), (x, y, z), 3, "GLfloat", x, "GLfloat", y, "GLfloat", z) +TRACE_GL_VOID(glScalex, (GLfixed x, GLfixed y, GLfixed z), (x, y, z), 3, "GLfixed", x, "GLfixed", y, "GLfixed", z) +TRACE_GL_VOID(glScalexOES, (GLfixed x, GLfixed y, GLfixed z), (x, y, z), 3, "GLfixed", x, "GLfixed", y, "GLfixed", z) +TRACE_GL_VOID(glScissor, (GLint x, GLint y, GLsizei width, GLsizei height), (x, y, width, height), 4, "GLint", x, "GLint", y, "GLsizei", width, "GLsizei", height) +TRACE_GL_VOID(glSelectPerfMonitorCountersAMD, (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList), (monitor, enable, group, numCounters, countersList), 5, "GLuint", monitor, "GLboolean", enable, "GLuint", group, "GLint", numCounters, "GLuint *", countersList) +TRACE_GL_VOID(glSetFenceNV, (GLuint fence, GLenum condition), (fence, condition), 2, "GLuint", fence, "GLenum", condition) +TRACE_GL_VOID(glShadeModel, (GLenum mode), (mode), 1, "GLenum", mode) +TRACE_GL_VOID(glShaderBinary, (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length), (n, shaders, binaryformat, binary, length), 5, "GLsizei", n, "const GLuint*", shaders, "GLenum", binaryformat, "const GLvoid*", binary, "GLsizei", length) +TRACE_GL_VOID(glShaderSource, (GLuint shader, GLsizei count, const GLchar** string, const GLint* length), (shader, count, string, length), 4, "GLuint", shader, "GLsizei", count, "const GLchar**", string, "const GLint*", length) +TRACE_GL_VOID(glStartTilingQCOM, (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask), (x, y, width, height, preserveMask), 5, "GLuint", x, "GLuint", y, "GLuint", width, "GLuint", height, "GLbitfield", preserveMask) +TRACE_GL_VOID(glStencilFunc, (GLenum func, GLint ref, GLuint mask), (func, ref, mask), 3, "GLenum", func, "GLint", ref, "GLuint", mask) +TRACE_GL_VOID(glStencilFuncSeparate, (GLenum face, GLenum func, GLint ref, GLuint mask), (face, func, ref, mask), 4, "GLenum", face, "GLenum", func, "GLint", ref, "GLuint", mask) +TRACE_GL_VOID(glStencilMask, (GLuint mask), (mask), 1, "GLuint", mask) +TRACE_GL_VOID(glStencilMaskSeparate, (GLenum face, GLuint mask), (face, mask), 2, "GLenum", face, "GLuint", mask) +TRACE_GL_VOID(glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass), (fail, zfail, zpass), 3, "GLenum", fail, "GLenum", zfail, "GLenum", zpass) +TRACE_GL_VOID(glStencilOpSeparate, (GLenum face, GLenum fail, GLenum zfail, GLenum zpass), (face, fail, zfail, zpass), 4, "GLenum", face, "GLenum", fail, "GLenum", zfail, "GLenum", zpass) +TRACE_GL(GLboolean, glTestFenceNV, (GLuint fence), (fence), 1, "GLuint", fence) +TRACE_GL_VOID(glTexCoordPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer), (size, type, stride, pointer), 4, "GLint", size, "GLenum", type, "GLsizei", stride, "const GLvoid *", pointer) +TRACE_GL_VOID(glTexEnvf, (GLenum target, GLenum pname, GLfloat param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glTexEnvfv, (GLenum target, GLenum pname, const GLfloat *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glTexEnvi, (GLenum target, GLenum pname, GLint param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLint", param) +TRACE_GL_VOID(glTexEnviv, (GLenum target, GLenum pname, const GLint *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLint *", params) +TRACE_GL_VOID(glTexEnvx, (GLenum target, GLenum pname, GLfixed param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glTexEnvxOES, (GLenum target, GLenum pname, GLfixed param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glTexEnvxv, (GLenum target, GLenum pname, const GLfixed *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glTexEnvxvOES, (GLenum target, GLenum pname, const GLfixed *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glTexGenfOES, (GLenum coord, GLenum pname, GLfloat param), (coord, pname, param), 3, "GLenum", coord, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glTexGenfvOES, (GLenum coord, GLenum pname, const GLfloat *params), (coord, pname, params), 3, "GLenum", coord, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glTexGeniOES, (GLenum coord, GLenum pname, GLint param), (coord, pname, param), 3, "GLenum", coord, "GLenum", pname, "GLint", param) +TRACE_GL_VOID(glTexGenivOES, (GLenum coord, GLenum pname, const GLint *params), (coord, pname, params), 3, "GLenum", coord, "GLenum", pname, "const GLint *", params) +TRACE_GL_VOID(glTexGenxOES, (GLenum coord, GLenum pname, GLfixed param), (coord, pname, param), 3, "GLenum", coord, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glTexGenxvOES, (GLenum coord, GLenum pname, const GLfixed *params), (coord, pname, params), 3, "GLenum", coord, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glTexImage2D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels), (target, level, internalformat, width, height, border, format, type, pixels), 9, "GLenum", target, "GLint", level, "GLint", internalformat, "GLsizei", width, "GLsizei", height, "GLint", border, "GLenum", format, "GLenum", type, "const GLvoid *", pixels) +TRACE_GL_VOID(glTexImage3DOES, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels), (target, level, internalformat, width, height, depth, border, format, type, pixels), 10, "GLenum", target, "GLint", level, "GLenum", internalformat, "GLsizei", width, "GLsizei", height, "GLsizei", depth, "GLint", border, "GLenum", format, "GLenum", type, "const GLvoid*", pixels) +TRACE_GL_VOID(glTexParameterf, (GLenum target, GLenum pname, GLfloat param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLfloat", param) +TRACE_GL_VOID(glTexParameterfv, (GLenum target, GLenum pname, const GLfloat *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLfloat *", params) +TRACE_GL_VOID(glTexParameteri, (GLenum target, GLenum pname, GLint param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLint", param) +TRACE_GL_VOID(glTexParameteriv, (GLenum target, GLenum pname, const GLint *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLint *", params) +TRACE_GL_VOID(glTexParameterx, (GLenum target, GLenum pname, GLfixed param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glTexParameterxOES, (GLenum target, GLenum pname, GLfixed param), (target, pname, param), 3, "GLenum", target, "GLenum", pname, "GLfixed", param) +TRACE_GL_VOID(glTexParameterxv, (GLenum target, GLenum pname, const GLfixed *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glTexParameterxvOES, (GLenum target, GLenum pname, const GLfixed *params), (target, pname, params), 3, "GLenum", target, "GLenum", pname, "const GLfixed *", params) +TRACE_GL_VOID(glTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels), (target, level, xoffset, yoffset, width, height, format, type, pixels), 9, "GLenum", target, "GLint", level, "GLint", xoffset, "GLint", yoffset, "GLsizei", width, "GLsizei", height, "GLenum", format, "GLenum", type, "const GLvoid *", pixels) +TRACE_GL_VOID(glTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels), (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels), 11, "GLenum", target, "GLint", level, "GLint", xoffset, "GLint", yoffset, "GLint", zoffset, "GLsizei", width, "GLsizei", height, "GLsizei", depth, "GLenum", format, "GLenum", type, "const GLvoid*", pixels) +TRACE_GL_VOID(glTranslatef, (GLfloat x, GLfloat y, GLfloat z), (x, y, z), 3, "GLfloat", x, "GLfloat", y, "GLfloat", z) +TRACE_GL_VOID(glTranslatex, (GLfixed x, GLfixed y, GLfixed z), (x, y, z), 3, "GLfixed", x, "GLfixed", y, "GLfixed", z) +TRACE_GL_VOID(glTranslatexOES, (GLfixed x, GLfixed y, GLfixed z), (x, y, z), 3, "GLfixed", x, "GLfixed", y, "GLfixed", z) +TRACE_GL_VOID(glUniform1f, (GLint location, GLfloat x), (location, x), 2, "GLint", location, "GLfloat", x) +TRACE_GL_VOID(glUniform1fv, (GLint location, GLsizei count, const GLfloat* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLfloat*", v) +TRACE_GL_VOID(glUniform1i, (GLint location, GLint x), (location, x), 2, "GLint", location, "GLint", x) +TRACE_GL_VOID(glUniform1iv, (GLint location, GLsizei count, const GLint* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLint*", v) +TRACE_GL_VOID(glUniform2f, (GLint location, GLfloat x, GLfloat y), (location, x, y), 3, "GLint", location, "GLfloat", x, "GLfloat", y) +TRACE_GL_VOID(glUniform2fv, (GLint location, GLsizei count, const GLfloat* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLfloat*", v) +TRACE_GL_VOID(glUniform2i, (GLint location, GLint x, GLint y), (location, x, y), 3, "GLint", location, "GLint", x, "GLint", y) +TRACE_GL_VOID(glUniform2iv, (GLint location, GLsizei count, const GLint* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLint*", v) +TRACE_GL_VOID(glUniform3f, (GLint location, GLfloat x, GLfloat y, GLfloat z), (location, x, y, z), 4, "GLint", location, "GLfloat", x, "GLfloat", y, "GLfloat", z) +TRACE_GL_VOID(glUniform3fv, (GLint location, GLsizei count, const GLfloat* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLfloat*", v) +TRACE_GL_VOID(glUniform3i, (GLint location, GLint x, GLint y, GLint z), (location, x, y, z), 4, "GLint", location, "GLint", x, "GLint", y, "GLint", z) +TRACE_GL_VOID(glUniform3iv, (GLint location, GLsizei count, const GLint* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLint*", v) +TRACE_GL_VOID(glUniform4f, (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w), (location, x, y, z, w), 5, "GLint", location, "GLfloat", x, "GLfloat", y, "GLfloat", z, "GLfloat", w) +TRACE_GL_VOID(glUniform4fv, (GLint location, GLsizei count, const GLfloat* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLfloat*", v) +TRACE_GL_VOID(glUniform4i, (GLint location, GLint x, GLint y, GLint z, GLint w), (location, x, y, z, w), 5, "GLint", location, "GLint", x, "GLint", y, "GLint", z, "GLint", w) +TRACE_GL_VOID(glUniform4iv, (GLint location, GLsizei count, const GLint* v), (location, count, v), 3, "GLint", location, "GLsizei", count, "const GLint*", v) +TRACE_GL_VOID(glUniformMatrix2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value), (location, count, transpose, value), 4, "GLint", location, "GLsizei", count, "GLboolean", transpose, "const GLfloat*", value) +TRACE_GL_VOID(glUniformMatrix3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value), (location, count, transpose, value), 4, "GLint", location, "GLsizei", count, "GLboolean", transpose, "const GLfloat*", value) +TRACE_GL_VOID(glUniformMatrix4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value), (location, count, transpose, value), 4, "GLint", location, "GLsizei", count, "GLboolean", transpose, "const GLfloat*", value) +TRACE_GL(GLboolean, glUnmapBufferOES, (GLenum target), (target), 1, "GLenum", target) +TRACE_GL_VOID(glUseProgram, (GLuint program), (program), 1, "GLuint", program) +TRACE_GL_VOID(glValidateProgram, (GLuint program), (program), 1, "GLuint", program) +TRACE_GL_VOID(glVertexAttrib1f, (GLuint indx, GLfloat x), (indx, x), 2, "GLuint", indx, "GLfloat", x) +TRACE_GL_VOID(glVertexAttrib1fv, (GLuint indx, const GLfloat* values), (indx, values), 2, "GLuint", indx, "const GLfloat*", values) +TRACE_GL_VOID(glVertexAttrib2f, (GLuint indx, GLfloat x, GLfloat y), (indx, x, y), 3, "GLuint", indx, "GLfloat", x, "GLfloat", y) +TRACE_GL_VOID(glVertexAttrib2fv, (GLuint indx, const GLfloat* values), (indx, values), 2, "GLuint", indx, "const GLfloat*", values) +TRACE_GL_VOID(glVertexAttrib3f, (GLuint indx, GLfloat x, GLfloat y, GLfloat z), (indx, x, y, z), 4, "GLuint", indx, "GLfloat", x, "GLfloat", y, "GLfloat", z) +TRACE_GL_VOID(glVertexAttrib3fv, (GLuint indx, const GLfloat* values), (indx, values), 2, "GLuint", indx, "const GLfloat*", values) +TRACE_GL_VOID(glVertexAttrib4f, (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w), (indx, x, y, z, w), 5, "GLuint", indx, "GLfloat", x, "GLfloat", y, "GLfloat", z, "GLfloat", w) +TRACE_GL_VOID(glVertexAttrib4fv, (GLuint indx, const GLfloat* values), (indx, values), 2, "GLuint", indx, "const GLfloat*", values) +TRACE_GL_VOID(glVertexAttribPointer, (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr), (indx, size, type, normalized, stride, ptr), 6, "GLuint", indx, "GLint", size, "GLenum", type, "GLboolean", normalized, "GLsizei", stride, "const GLvoid*", ptr) +TRACE_GL_VOID(glVertexPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer), (size, type, stride, pointer), 4, "GLint", size, "GLenum", type, "GLsizei", stride, "const GLvoid *", pointer) +TRACE_GL_VOID(glViewport, (GLint x, GLint y, GLsizei width, GLsizei height), (x, y, width, height), 4, "GLint", x, "GLint", y, "GLsizei", width, "GLsizei", height) +TRACE_GL_VOID(glWeightPointerOES, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer), (size, type, stride, pointer), 4, "GLint", size, "GLenum", type, "GLsizei", stride, "const GLvoid *", pointer) diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 70bde0168866..3f378e191d86 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -25,7 +25,6 @@ import com.android.internal.view.IInputMethodClient; import com.android.internal.view.IInputMethodManager; import com.android.internal.view.IInputMethodSession; import com.android.internal.view.InputBindResult; -import com.android.internal.view.InputMethodAndSubtypeEnabler; import com.android.server.StatusBarManagerService; @@ -1549,10 +1548,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } private void showInputMethodAndSubtypeEnabler() { - Intent intent = new Intent(); - intent.setClassName("android", InputMethodAndSubtypeEnabler.class.getCanonicalName()); + Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); + | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED + | Intent.FLAG_ACTIVITY_CLEAR_TOP); mContext.startActivity(intent); } |