diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 16:27:47 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 16:27:47 -0700 |
commit | 43a6d88e4ee13836d015a114bb0065b679cfa916 (patch) | |
tree | 9a18eec2b1eb19ca69306db6c950bd5905c0816e /include | |
parent | 8851e163fc5bc17d139bf29cd2ec2f3926d342bc (diff) | |
parent | a1f6eff297a3e4870e22fdae926648bda3466805 (diff) | |
download | frameworks_base-43a6d88e4ee13836d015a114bb0065b679cfa916.zip frameworks_base-43a6d88e4ee13836d015a114bb0065b679cfa916.tar.gz frameworks_base-43a6d88e4ee13836d015a114bb0065b679cfa916.tar.bz2 |
Merge changes 20345,20346,20347
* changes:
update most gl tests to use EGLUtils
added two EGL helpers for selecting a config matching a certain pixelformat or native window type
added NATIVE_WINDOW_FORMAT attribute to android_native_window_t
Diffstat (limited to 'include')
-rw-r--r-- | include/ui/EGLUtils.h | 51 | ||||
-rw-r--r-- | include/ui/egl/android_natives.h | 3 |
2 files changed, 53 insertions, 1 deletions
diff --git a/include/ui/EGLUtils.h b/include/ui/EGLUtils.h new file mode 100644 index 0000000..48777b6 --- /dev/null +++ b/include/ui/EGLUtils.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 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. + */ + + +#ifndef ANDROID_UI_EGLUTILS_H +#define ANDROID_UI_EGLUTILS_H + +#include <utils/Errors.h> +#include <ui/PixelFormat.h> +#include <EGL/egl.h> + + +// ---------------------------------------------------------------------------- +namespace android { +// ---------------------------------------------------------------------------- + +class EGLUtils +{ +public: + + static status_t selectConfigForPixelFormat( + EGLDisplay dpy, + EGLint const* attrs, + PixelFormat format, + EGLConfig* outConfig); + + static status_t selectConfigForNativeWindow( + EGLDisplay dpy, + EGLint const* attrs, + EGLNativeWindowType window, + EGLConfig* outConfig); +}; + +// ---------------------------------------------------------------------------- +}; // namespace android +// ---------------------------------------------------------------------------- + +#endif /* ANDROID_UI_EGLUTILS_H */ diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index a3a1316..7da69b1 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -63,7 +63,8 @@ struct android_native_base_t /* attributes queriable with query() */ enum { NATIVE_WINDOW_WIDTH = 0, - NATIVE_WINDOW_HEIGHT = 1 + NATIVE_WINDOW_HEIGHT = 1, + NATIVE_WINDOW_FORMAT = 2, }; struct android_native_window_t |