Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comments and documentation #852

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Comments and documentation #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
968b8cc
Add comment explaining EGL version defaults.
tedfelix Jul 19, 2022
3eef787
Fix typos in teapots sample doc.
tedfelix Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions native-activity/app/src/main/cpp/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ static int engine_init_display(struct engine* engine) {
eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format);
surface =
eglCreateWindowSurface(display, config, engine->app->window, nullptr);

/* A version of OpenGL has not been specified here. This will default to
* OpenGL 1.0. You will need to change this if you want to use the newer
* features of OpenGL like shaders. */
context = eglCreateContext(display, config, nullptr, nullptr);

if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE) {
Expand Down
8 changes: 4 additions & 4 deletions teapots/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Teapots

Teapots is an collection of Android C++ samples that uses a Teapot rendering to
demostrate Android NDK platform features:
demonstrate Android NDK platform features:

- classic-teapot: Rendering classic teapot mesh using GLES 2.0 API and
[NativeActivity](http://developer.android.com/reference/android/app/NativeActivity.html).
- more-teapots: Rendering multiple instances of Classic Teapot with GLES 3.0
Instance Rendering
- choreographer-30fps: demonstrates multiple frame rate throttoling techniques
- choreographer-30fps: demonstrates multiple frame rate throttling techniques
based on API level using Choreographer API and EGL Android presentation time
extension.
- textured-teapot: Rendering classic teapot plus textures
Expand All @@ -18,7 +18,7 @@ This sample uses the new
[Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds)
with C++ support.

## Pre-requisites
## Prerequisites

- Android Studio 4.0.0 with [NDK](https://developer.android.com/ndk/)
- Android
Expand Down Expand Up @@ -51,7 +51,7 @@ submitting a pull request through GitHub. Please see
[CONTRIBUTING.md](../CONTRIBUTING.md) for more details.

- [Stack Overflow](http://stackoverflow.com/questions/tagged/android-ndk)
- [Android Tools Feedbacks](http://tools.android.com/feedback)
- [Android Tools Feedback](http://tools.android.com/feedback)

## License

Expand Down
Loading