diff options
| author | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-03-04 19:30:11 +0400 |
|---|---|---|
| committer | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-03-04 19:30:11 +0400 |
| commit | 83c1d892f47218f95e8c9adb2d28956e19e90493 (patch) | |
| tree | 73b178b97b42fa5c3f51396ddd55d59420909679 /GLESv1_CM | |
| parent | ddd1fe469855684044079c510afb620539e7d6c3 (diff) | |
| download | emulator-yagl-83c1d892f47218f95e8c9adb2d28956e19e90493.tar.gz emulator-yagl-83c1d892f47218f95e8c9adb2d28956e19e90493.tar.bz2 emulator-yagl-83c1d892f47218f95e8c9adb2d28956e19e90493.zip | |
YaGL: Convert textures properly
1. GL_ALPHA to GL_RGBA conversion is wrong after all, previous
conversion was correct
2. GLESv1_CM should never convert textures since it always uses
legacy host OpenGL context
Change-Id: I1b8062c85f377b32bc2f75a58ff969e83acd65d0
Diffstat (limited to 'GLESv1_CM')
| -rw-r--r-- | GLESv1_CM/yagl_gles1_context.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/GLESv1_CM/yagl_gles1_context.c b/GLESv1_CM/yagl_gles1_context.c index ec2465e..4f14c94 100644 --- a/GLESv1_CM/yagl_gles1_context.c +++ b/GLESv1_CM/yagl_gles1_context.c @@ -594,7 +594,8 @@ static void yagl_gles1_cpal_tex_uncomp_and_apply(struct yagl_gles_context *ctx, yagl_gles_texture_set_internalformat(texture, fmt_desc->uncomp_format, - fmt_desc->pixel_type); + fmt_desc->pixel_type, + yagl_gles_context_convert_textures(ctx)); return; } @@ -669,7 +670,8 @@ static void yagl_gles1_cpal_tex_uncomp_and_apply(struct yagl_gles_context *ctx, yagl_gles_texture_set_internalformat(texture, fmt_desc->uncomp_format, - fmt_desc->pixel_type); + fmt_desc->pixel_type, + yagl_gles_context_convert_textures(ctx)); } static void yagl_gles1_etc1_rgb8_uncomp_and_apply(struct yagl_gles_context *ctx, @@ -706,7 +708,8 @@ static void yagl_gles1_etc1_rgb8_uncomp_and_apply(struct yagl_gles_context *ctx, yagl_gles_texture_set_internalformat(texture, GL_RGBA8, - GL_UNSIGNED_BYTE); + GL_UNSIGNED_BYTE, + yagl_gles_context_convert_textures(ctx)); return; } @@ -737,7 +740,8 @@ static void yagl_gles1_etc1_rgb8_uncomp_and_apply(struct yagl_gles_context *ctx, yagl_gles_texture_set_internalformat(texture, GL_RGBA8, - GL_UNSIGNED_BYTE); + GL_UNSIGNED_BYTE, + yagl_gles_context_convert_textures(ctx)); } static void yagl_gles1_context_compressed_tex_image_2d(struct yagl_gles_context *ctx, |