emulator: opengl: make internal tables const.
+ fix a typo. Change-Id: I4c290d673de5eff24998b97cfb996d9da17dd006
This commit is contained in:
@@ -129,7 +129,7 @@ void initClientFuncs(const EGLClient_glesInterface *iface, int idx)
|
|||||||
#define API_ENTRY_RET(rtype,fname,params,args) \
|
#define API_ENTRY_RET(rtype,fname,params,args) \
|
||||||
API_ENTRY(fname,params,args)
|
API_ENTRY(fname,params,args)
|
||||||
|
|
||||||
static struct _client_ext_funcs {
|
static const struct _client_ext_funcs {
|
||||||
const char *fname;
|
const char *fname;
|
||||||
void* proc;
|
void* proc;
|
||||||
} s_client_ext_funcs[] = {
|
} s_client_ext_funcs[] = {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// Each extension function should have one of the following
|
// Each extension function should have one of the following
|
||||||
// macro definitions:
|
// macro definitions:
|
||||||
// API_ENTRY(funcname, paramlist, arglist)
|
// API_ENTRY(funcname, paramlist, arglist)
|
||||||
// -or- (in case funciton has return value)
|
// -or- (if the function has a return value)
|
||||||
// API_ENTRY_RET(return_type,funcname, paramlist, arglist)
|
// API_ENTRY_RET(return_type,funcname, paramlist, arglist)
|
||||||
//
|
//
|
||||||
API_ENTRY(glEGLImageTargetTexture2DOES,
|
API_ENTRY(glEGLImageTargetTexture2DOES,
|
||||||
|
|||||||
@@ -19,17 +19,17 @@
|
|||||||
|
|
||||||
static const int systemEGLVersionMajor = 1;
|
static const int systemEGLVersionMajor = 1;
|
||||||
static const int systemEGLVersionMinor = 4;
|
static const int systemEGLVersionMinor = 4;
|
||||||
static const char *systemEGLVendor = "Google Android emulator";
|
static const char systemEGLVendor[] = "Google Android emulator";
|
||||||
|
|
||||||
// list of extensions supported by this EGL implementation
|
// list of extensions supported by this EGL implementation
|
||||||
// NOTE that each extension name should be suffixed with space
|
// NOTE that each extension name should be suffixed with space
|
||||||
static const char *systemStaticEGLExtensions =
|
static const char systemStaticEGLExtensions[] =
|
||||||
"EGL_ANDROID_image_native_buffer ";
|
"EGL_ANDROID_image_native_buffer ";
|
||||||
|
|
||||||
// list of extensions supported by this EGL implementation only if supported
|
// list of extensions supported by this EGL implementation only if supported
|
||||||
// on the host implementation.
|
// on the host implementation.
|
||||||
// NOTE that each extension name should be suffixed with space
|
// NOTE that each extension name should be suffixed with space
|
||||||
static const char *systemDynamicEGLExtensions =
|
static const char systemDynamicEGLExtensions[] =
|
||||||
"EGL_KHR_image_base "
|
"EGL_KHR_image_base "
|
||||||
"EGL_KHR_gl_texture_2d_image ";
|
"EGL_KHR_gl_texture_2d_image ";
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
static struct _egl_funcs_by_name {
|
static const struct _egl_funcs_by_name {
|
||||||
const char *name;
|
const char *name;
|
||||||
void *proc;
|
void *proc;
|
||||||
} egl_funcs_by_name[] = {
|
} egl_funcs_by_name[] = {
|
||||||
@@ -63,4 +63,4 @@ static struct _egl_funcs_by_name {
|
|||||||
{"eglSetSwapRectangleANDROID", (void *)eglSetSwapRectangleANDROID}
|
{"eglSetSwapRectangleANDROID", (void *)eglSetSwapRectangleANDROID}
|
||||||
};
|
};
|
||||||
|
|
||||||
static int egl_num_funcs = sizeof(egl_funcs_by_name) / sizeof(struct _egl_funcs_by_name);
|
static const int egl_num_funcs = sizeof(egl_funcs_by_name) / sizeof(struct _egl_funcs_by_name);
|
||||||
|
|||||||
Reference in New Issue
Block a user