TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for:

Browse Source 
Texture::F_rgba16
Texture::F_rgba32
This commit is contained in:
aignacio_sf 2006-12-08 22:44:06 +00:00
parent 6bb18ad099
commit c8c7eaf6fb
2 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
panda/src/dxgsg9/dxTextureContext9.cxx
View File

@ -97,6 +97,8 @@ create_texture(DXScreenData &scrn) {
DWORD target_bpp = get_bits_per_pixel(get_texture()->get_format(), &num_alpha_bits); DWORD target_bpp = get_bits_per_pixel(get_texture()->get_format(), &num_alpha_bits);
DWORD num_color_channels = get_texture()->get_num_components(); DWORD num_color_channels = get_texture()->get_num_components();
// printf ("target_bpp %d, num_color_channels %d num_alpha_bits %d \n", target_bpp, num_color_channels, num_alpha_bits);
//PRINT_REFCNT(dxgsg9, scrn._d3d9); //PRINT_REFCNT(dxgsg9, scrn._d3d9);
DWORD orig_width = (DWORD)get_texture()->get_x_size(); DWORD orig_width = (DWORD)get_texture()->get_x_size();
@ -291,6 +293,26 @@ create_texture(DXScreenData &scrn) {
// target_bpp is REQUESTED bpp, not what exists in the texture // target_bpp is REQUESTED bpp, not what exists in the texture
// array (the texture array contains num_color_channels*8bits) // array (the texture array contains num_color_channels*8bits)
case 128:
// check if format is supported
if (scrn._supports_rgba32f_texture_format) {
target_pixel_format = D3DFMT_A32B32G32R32F;
}
else {
target_pixel_format = scrn._render_to_texture_d3d_format;
}
goto found_matching_format;
case 64:
// check if format is supported
if (scrn._supports_rgba16f_texture_format) {
target_pixel_format = D3DFMT_A16B16G16R16F;
}
else {
target_pixel_format = scrn._render_to_texture_d3d_format;
}
goto found_matching_format;
case 32: case 32:
if (!((num_color_channels == 3) || (num_color_channels == 4))) if (!((num_color_channels == 3) || (num_color_channels == 4)))
break; //bail break; //bail
@ -643,13 +665,21 @@ create_texture(DXScreenData &scrn) {
D3DPOOL pool; D3DPOOL pool;
usage = 0; usage = 0;
// if (get_texture()->get_render_to_texture ( )) {
if (get_texture()->get_render_to_texture ( )) { if (get_texture()->get_render_to_texture ( )) {
// REQUIRED PARAMETERS // REQUIRED PARAMETERS
_managed = false; _managed = false;
pool = D3DPOOL_DEFAULT; pool = D3DPOOL_DEFAULT;
usage = D3DUSAGE_RENDERTARGET; usage = D3DUSAGE_RENDERTARGET;
target_pixel_format = scrn._render_to_texture_d3d_format; if (target_bpp <= 32 ) {
target_pixel_format = scrn._render_to_texture_d3d_format;
}
dxgsg9_cat.debug ()
<< "*** RENDER TO TEXTURE ***: format "
<< D3DFormatStr(target_pixel_format)
<< " "
<< target_pixel_format
<< "\n";
} }
else { else {
_managed = scrn._managed_textures; _managed = scrn._managed_textures;
@ -748,12 +778,10 @@ create_texture(DXScreenData &scrn) {
data_size = target_width * target_height * target_depth; data_size = target_width * target_height * target_depth;
data_size = (int) ((float) data_size * bytes_per_texel); data_size = (int) ((float) data_size * bytes_per_texel);
if (_has_mipmaps) if (_has_mipmaps) {
{
data_size = (int) ((float) data_size * 1.3f); data_size = (int) ((float) data_size * 1.3f);
} }
if (get_texture()->get_texture_type() == Texture::TT_cube_map) if (get_texture()->get_texture_type() == Texture::TT_cube_map) {
{
data_size *= 6; data_size *= 6;
} }
update_data_size_bytes(data_size); update_data_size_bytes(data_size);
@ -808,6 +836,12 @@ create_texture(DXScreenData &scrn) {
hr = fill_d3d_texture_pixels(scrn._supports_automatic_mipmap_generation); hr = fill_d3d_texture_pixels(scrn._supports_automatic_mipmap_generation);
if (FAILED(hr)) { if (FAILED(hr)) {
dxgsg9_cat.debug ()
<< "*** fill_d3d_texture_pixels failed ***: format "
<< target_pixel_format
<< "\n";
goto error_exit; goto error_exit;
} }
@ -1544,6 +1578,12 @@ get_bits_per_pixel(Texture::Format format, int *alphbits) {
case Texture::F_rgba12: case Texture::F_rgba12:
*alphbits = 12; *alphbits = 12;
return 48; return 48;
case Texture::F_rgba16:
*alphbits = 16;
return 64;
case Texture::F_rgba32:
*alphbits = 32;
return 128;
} }
return 8; return 8;
} }

2
panda/src/dxgsg9/wdxGraphicsPipe9.cxx
View File

@ -920,6 +920,8 @@ const char *D3DFormatStr(D3DFORMAT fmt) {
CASESTR(D3DFMT_VERTEXDATA); CASESTR(D3DFMT_VERTEXDATA);
CASESTR(D3DFMT_INDEX16); CASESTR(D3DFMT_INDEX16);
CASESTR(D3DFMT_INDEX32); CASESTR(D3DFMT_INDEX32);
CASESTR(D3DFMT_A16B16G16R16F);
CASESTR(D3DFMT_A32B32G32R32F);
} }
return "Invalid D3DFORMAT"; return "Invalid D3DFORMAT";