LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am dcbb5192: Merge "opengl translator: add native config id to EglConfig"

Browse Source 
* commit 'dcbb51924f152c4e4502cd7f1326aeafde3076ed':
  opengl translator: add native config id to EglConfig
This commit is contained in:
David Turner
2011-07-08 10:43:42 -07:00
committed by Android Git Automerger
parent 91ed228d78 dcbb51924f
commit 398e3db06e
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/emulator/opengl/host/libs/Translator/EGL/EglConfig.cpp
View File

@@ -48,6 +48,7 @@ EglConfig::EglConfig(EGLint red_size,
m_bind_to_tex_rgba(EGL_FALSE), //not supported for now m_bind_to_tex_rgba(EGL_FALSE), //not supported for now
m_caveat(caveat), m_caveat(caveat),
m_config_id(config_id), m_config_id(config_id),
m_native_config_id(config_id),
m_frame_buffer_level(frame_buffer_level), m_frame_buffer_level(frame_buffer_level),
m_depth_size(depth_size), m_depth_size(depth_size),
m_max_pbuffer_width(max_pbuffer_width), m_max_pbuffer_width(max_pbuffer_width),
@@ -82,6 +83,7 @@ EglConfig::EglConfig(EGLint red_size,
m_bind_to_tex_rgba(conf.m_bind_to_tex_rgba), m_bind_to_tex_rgba(conf.m_bind_to_tex_rgba),
m_caveat(conf.m_caveat), m_caveat(conf.m_caveat),
m_config_id(conf.m_config_id), m_config_id(conf.m_config_id),
m_native_config_id(conf.m_native_config_id),
m_frame_buffer_level(conf.m_frame_buffer_level), m_frame_buffer_level(conf.m_frame_buffer_level),
m_depth_size(conf.m_depth_size), m_depth_size(conf.m_depth_size),
m_max_pbuffer_width(conf.m_max_pbuffer_width), m_max_pbuffer_width(conf.m_max_pbuffer_width),
@@ -121,6 +123,7 @@ EglConfig::EglConfig(const EglConfig& conf,
m_bind_to_tex_rgba(conf.m_bind_to_tex_rgba), m_bind_to_tex_rgba(conf.m_bind_to_tex_rgba),
m_caveat(conf.m_caveat), m_caveat(conf.m_caveat),
m_config_id(config_id), m_config_id(config_id),
m_native_config_id(conf.m_native_config_id),
m_frame_buffer_level(conf.m_frame_buffer_level), m_frame_buffer_level(conf.m_frame_buffer_level),
m_depth_size(conf.m_depth_size), m_depth_size(conf.m_depth_size),
m_max_pbuffer_width(conf.m_max_pbuffer_width), m_max_pbuffer_width(conf.m_max_pbuffer_width),

2
tools/emulator/opengl/host/libs/Translator/EGL/EglConfig.h
View File

@@ -32,6 +32,7 @@ public:
bool choosen(const EglConfig& dummy); bool choosen(const EglConfig& dummy);
EGLint surfaceType(){ return m_surface_type;}; EGLint surfaceType(){ return m_surface_type;};
EGLint id(){return m_config_id;}; EGLint id(){return m_config_id;};
EGLint nativeId(){return m_native_config_id;};
EGLNativePixelFormatType nativeConfig(){ return m_nativeFormat;} EGLNativePixelFormatType nativeConfig(){ return m_nativeFormat;}
EglConfig(EGLint red_size, EglConfig(EGLint red_size,
@@ -78,6 +79,7 @@ private:
const EGLBoolean m_bind_to_tex_rgba; const EGLBoolean m_bind_to_tex_rgba;
const EGLenum m_caveat; const EGLenum m_caveat;
const EGLint m_config_id; const EGLint m_config_id;
const EGLint m_native_config_id;
const EGLint m_frame_buffer_level; const EGLint m_frame_buffer_level;
const EGLint m_depth_size; const EGLint m_depth_size;
const EGLint m_max_pbuffer_width; const EGLint m_max_pbuffer_width;