Skip to content

Commit 8abfab1

Browse files
committed
emulator: opengl: make internal tables const.
+ fix a typo. Change-Id: I4c290d673de5eff24998b97cfb996d9da17dd006
1 parent 4e6af74 commit 8abfab1

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

tools/emulator/opengl/system/egl/ClientAPIExts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void initClientFuncs(const EGLClient_glesInterface *iface, int idx)
129129
#define API_ENTRY_RET(rtype,fname,params,args) \
130130
API_ENTRY(fname,params,args)
131131

132-
static struct _client_ext_funcs {
132+
static const struct _client_ext_funcs {
133133
const char *fname;
134134
void* proc;
135135
} s_client_ext_funcs[] = {

tools/emulator/opengl/system/egl/ClientAPIExts.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Each extension function should have one of the following
33
// macro definitions:
44
// API_ENTRY(funcname, paramlist, arglist)
5-
// -or- (in case funciton has return value)
5+
// -or- (if the function has a return value)
66
// API_ENTRY_RET(return_type,funcname, paramlist, arglist)
77
//
88
API_ENTRY(glEGLImageTargetTexture2DOES,

tools/emulator/opengl/system/egl/eglDisplay.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919

2020
static const int systemEGLVersionMajor = 1;
2121
static const int systemEGLVersionMinor = 4;
22-
static const char *systemEGLVendor = "Google Android emulator";
22+
static const char systemEGLVendor[] = "Google Android emulator";
2323

2424
// list of extensions supported by this EGL implementation
2525
// NOTE that each extension name should be suffixed with space
26-
static const char *systemStaticEGLExtensions =
26+
static const char systemStaticEGLExtensions[] =
2727
"EGL_ANDROID_image_native_buffer ";
2828

2929
// list of extensions supported by this EGL implementation only if supported
3030
// on the host implementation.
3131
// NOTE that each extension name should be suffixed with space
32-
static const char *systemDynamicEGLExtensions =
32+
static const char systemDynamicEGLExtensions[] =
3333
"EGL_KHR_image_base "
3434
"EGL_KHR_gl_texture_2d_image ";
3535

tools/emulator/opengl/system/egl/egl_ftable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
static struct _egl_funcs_by_name {
16+
static const struct _egl_funcs_by_name {
1717
const char *name;
1818
void *proc;
1919
} egl_funcs_by_name[] = {
@@ -63,4 +63,4 @@ static struct _egl_funcs_by_name {
6363
{"eglSetSwapRectangleANDROID", (void *)eglSetSwapRectangleANDROID}
6464
};
6565

66-
static int egl_num_funcs = sizeof(egl_funcs_by_name) / sizeof(struct _egl_funcs_by_name);
66+
static const int egl_num_funcs = sizeof(egl_funcs_by_name) / sizeof(struct _egl_funcs_by_name);

0 commit comments

Comments
 (0)