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

directx handling for unsupported compressed textures in cache

Browse Source
This commit is contained in:
David Rose 2008-08-22 20:45:39 +00:00
parent 59b5ab684d
commit 63a2d6bfd5
7 changed files with 145 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -274,18 +274,21 @@ upload_texture(DXTextureContext8 *dtc) {
return false;
}
if (_incomplete_render &&
!tex->has_ram_image() && tex->might_have_ram_image() &&
tex->has_simple_ram_image() &&
!_loader.is_null()) {
// If we don't have the texture data right now, go get it, but in
// the meantime load a temporary simple image in its place.
async_reload_texture(dtc);
if (!tex->has_ram_image()) {
if (dtc->was_simple_image_modified()) {
return dtc->create_simple_texture(*_screen);
if (_incomplete_render) {
bool has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image();
if (!has_image && tex->might_have_ram_image() &&
tex->has_simple_ram_image() &&
!_loader.is_null()) {
// If we don't have the texture data right now, go get it, but in
// the meantime load a temporary simple image in its place.
async_reload_texture(dtc);
has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image();
if (!has_image) {
if (dtc->was_simple_image_modified()) {
return dtc->create_simple_texture(*_screen);
}
return true;
}
return true;
}
}

72
panda/src/dxgsg8/dxTextureContext8.cxx
View File

@ -753,7 +753,7 @@ create_texture(DXScreenData &scrn) {
<< " => " << D3DFormatStr(target_pixel_format) << endl;
}
hr = fill_d3d_texture_pixels();
hr = fill_d3d_texture_pixels(scrn);
if (FAILED(hr)) {
goto error_exit;
}
@ -835,7 +835,7 @@ create_simple_texture(DXScreenData &scrn) {
CPTA_uchar image = get_texture()->get_simple_ram_image();
hr = -1;
// hr = fill_d3d_texture_pixels(scrn._supports_automatic_mipmap_generation, scrn._d3d_device);
// hr = fill_d3d_texture_pixels(scrn);
IDirect3DSurface8 *surface = NULL;
_d3d_2d_texture->GetSurfaceLevel(0, &surface);
@ -1429,17 +1429,34 @@ exit_FillMipmapSurf:
// Description:
////////////////////////////////////////////////////////////////////
HRESULT DXTextureContext8::
fill_d3d_texture_pixels() {
fill_d3d_texture_pixels(DXScreenData &scrn) {
Texture *tex = get_texture();
nassertr(IS_VALID_PTR(tex), E_FAIL);
if (tex->get_texture_type() == Texture::TT_3d_texture) {
return fill_d3d_volume_texture_pixels();
return fill_d3d_volume_texture_pixels(scrn);
}
HRESULT hr = E_FAIL;
nassertr(IS_VALID_PTR(tex), E_FAIL);
CPTA_uchar image = tex->get_ram_image();
CPTA_uchar image;
if (scrn._dxgsg8->get_supports_compressed_texture()) {
image = tex->get_ram_image();
} else {
image = tex->get_uncompressed_ram_image();
}
Texture::CompressionMode image_compression;
if (image.is_null()) {
image_compression = Texture::CM_off;
} else {
image_compression = tex->get_ram_image_compression();
}
if (!scrn._dxgsg8->get_supports_compressed_texture_format(image_compression)) {
image = tex->get_uncompressed_ram_image();
image_compression = Texture::CM_off;
}
if (image.is_null()) {
// The texture doesn't have an image to load. That's ok; it
// might be a texture we've rendered to by frame buffer
@ -1530,11 +1547,30 @@ fill_d3d_texture_pixels() {
// Description:
////////////////////////////////////////////////////////////////////
HRESULT DXTextureContext8::
fill_d3d_volume_texture_pixels() {
fill_d3d_volume_texture_pixels(DXScreenData &scrn) {
Texture *tex = get_texture();
HRESULT hr = E_FAIL;
nassertr(IS_VALID_PTR(get_texture()), E_FAIL);
nassertr(IS_VALID_PTR(tex), E_FAIL);
CPTA_uchar image;
if (scrn._dxgsg8->get_supports_compressed_texture()) {
image = tex->get_ram_image();
} else {
image = tex->get_uncompressed_ram_image();
}
Texture::CompressionMode image_compression;
if (image.is_null()) {
image_compression = Texture::CM_off;
} else {
image_compression = tex->get_ram_image_compression();
}
if (!scrn._dxgsg8->get_supports_compressed_texture_format(image_compression)) {
image = tex->get_uncompressed_ram_image();
image_compression = Texture::CM_off;
}
CPTA_uchar image = get_texture()->get_ram_image();
if (image.is_null()) {
// The texture doesn't have an image to load. That's ok; it
// might be a texture we've rendered to by frame buffer
@ -1545,15 +1581,15 @@ fill_d3d_volume_texture_pixels() {
PStatTimer timer(GraphicsStateGuardian::_load_texture_pcollector);
nassertr(IS_VALID_PTR(_d3d_texture), E_FAIL);
nassertr(get_texture()->get_texture_type() == Texture::TT_3d_texture, E_FAIL);
nassertr(tex->get_texture_type() == Texture::TT_3d_texture, E_FAIL);
DWORD orig_width = (DWORD) get_texture()->get_x_size();
DWORD orig_height = (DWORD) get_texture()->get_y_size();
DWORD orig_depth = (DWORD) get_texture()->get_z_size();
DWORD num_color_channels = get_texture()->get_num_components();
DWORD orig_width = (DWORD) tex->get_x_size();
DWORD orig_height = (DWORD) tex->get_y_size();
DWORD orig_depth = (DWORD) tex->get_z_size();
DWORD num_color_channels = tex->get_num_components();
D3DFORMAT source_format = _d3d_format;
BYTE *image_pixels = (BYTE*)image.p();
int component_width = get_texture()->get_component_width();
int component_width = tex->get_component_width();
nassertr(IS_VALID_PTR(image_pixels), E_FAIL);
@ -1566,7 +1602,7 @@ fill_d3d_volume_texture_pixels() {
if (FAILED(hr)) {
dxgsg8_cat.error()
<< "FillDDSurfaceTexturePixels failed for " << get_texture()->get_name()
<< "FillDDSurfaceTexturePixels failed for " << tex->get_name()
<< ", GetSurfaceLevel failed" << D3DERRORSTRING(hr);
return E_FAIL;
}
@ -1625,7 +1661,7 @@ fill_d3d_volume_texture_pixels() {
// original image, but dx8 doesn't support high-precision images
// anyway.
int num_components = get_texture()->get_num_components();
int num_components = tex->get_num_components();
int num_pixels = orig_width * orig_height * orig_depth * num_components;
BYTE *temp_buffer = new BYTE[num_pixels];
if (!IS_VALID_PTR(temp_buffer)) {
@ -1654,7 +1690,7 @@ fill_d3d_volume_texture_pixels() {
&source_size, level_0_filter, (D3DCOLOR)0x0);
if (FAILED(hr)) {
dxgsg8_cat.error()
<< "FillDDSurfaceTexturePixels failed for " << get_texture()->get_name()
<< "FillDDSurfaceTexturePixels failed for " << tex->get_name()
<< ", D3DXLoadVolumeFromMem failed" << D3DERRORSTRING(hr);
goto exit_FillDDSurf;
}
@ -1672,7 +1708,7 @@ fill_d3d_volume_texture_pixels() {
mip_filter_flags);
if (FAILED(hr)) {
dxgsg8_cat.error()
<< "FillDDSurfaceTexturePixels failed for " << get_texture()->get_name()
<< "FillDDSurfaceTexturePixels failed for " << tex->get_name()
<< ", D3DXFilterTex failed" << D3DERRORSTRING(hr);
goto exit_FillDDSurf;
}

3
panda/src/dxgsg8/dxTextureContext8.h
View File

@ -47,7 +47,8 @@ public:
private:
HRESULT fill_d3d_texture_mipmap_pixels(int mip_level, int depth_index, D3DFORMAT source_format);
HRESULT fill_d3d_texture_pixels();
HRESULT fill_d3d_volume_texture_pixels();
HRESULT fill_d3d_texture_pixels(DXScreenData &scrn);
HRESULT fill_d3d_volume_texture_pixels(DXScreenData &scrn);
static int down_to_power_2(int value);
unsigned int get_bits_per_pixel(Texture::Format format, int *alphbits);

25
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -336,18 +336,21 @@ upload_texture(DXTextureContext9 *dtc) {
return false;
}
if (_incomplete_render &&
!tex->has_ram_image() && tex->might_have_ram_image() &&
tex->has_simple_ram_image() &&
!_loader.is_null()) {
// If we don't have the texture data right now, go get it, but in
// the meantime load a temporary simple image in its place.
async_reload_texture(dtc);
if (!tex->has_ram_image()) {
if (dtc->was_simple_image_modified()) {
return dtc->create_simple_texture(*_screen);
if (_incomplete_render) {
bool has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image();
if (!has_image && tex->might_have_ram_image() &&
tex->has_simple_ram_image() &&
!_loader.is_null()) {
// If we don't have the texture data right now, go get it, but in
// the meantime load a temporary simple image in its place.
async_reload_texture(dtc);
has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image();
if (!has_image) {
if (dtc->was_simple_image_modified()) {
return dtc->create_simple_texture(*_screen);
}
return true;
}
return true;
}
}

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

@ -920,7 +920,7 @@ create_texture(DXScreenData &scrn) {
<< " => " << D3DFormatStr(target_pixel_format) << endl;
}
hr = fill_d3d_texture_pixels(scrn._supports_automatic_mipmap_generation, scrn._d3d_device);
hr = fill_d3d_texture_pixels(scrn);
if (FAILED(hr)) {
dxgsg9_cat.debug ()
@ -1030,7 +1030,7 @@ create_simple_texture(DXScreenData &scrn) {
CPTA_uchar image = get_texture()->get_simple_ram_image();
hr = -1;
// hr = fill_d3d_texture_pixels(scrn._supports_automatic_mipmap_generation, scrn._d3d_device);
// hr = fill_d3d_texture_pixels(scrn);
IDirect3DSurface9 *surface = NULL;
_d3d_2d_texture->GetSurfaceLevel(0, &surface);
@ -1625,16 +1625,35 @@ exit_FillMipmapSurf:
// Description:
////////////////////////////////////////////////////////////////////
HRESULT DXTextureContext9::
fill_d3d_texture_pixels(bool supports_automatic_mipmap_generation, IDirect3DDevice9 *device) {
fill_d3d_texture_pixels(DXScreenData &scrn) {
IDirect3DDevice9 *device = scrn._d3d_device;
Texture *tex = get_texture();
nassertr(IS_VALID_PTR(tex), E_FAIL);
if (tex->get_texture_type() == Texture::TT_3d_texture) {
return fill_d3d_volume_texture_pixels();
return fill_d3d_volume_texture_pixels(scrn);
}
HRESULT hr = E_FAIL;
CPTA_uchar image = tex->get_ram_image();
CPTA_uchar image;
if (scrn._dxgsg9->get_supports_compressed_texture()) {
image = tex->get_ram_image();
} else {
image = tex->get_uncompressed_ram_image();
}
Texture::CompressionMode image_compression;
if (image.is_null()) {
image_compression = Texture::CM_off;
} else {
image_compression = tex->get_ram_image_compression();
}
if (!scrn._dxgsg9->get_supports_compressed_texture_format(image_compression)) {
image = tex->get_uncompressed_ram_image();
image_compression = Texture::CM_off;
}
if (image.is_null()) {
// The texture doesn't have an image to load. That's ok; it
// might be a texture we've rendered to by frame buffer
@ -1732,7 +1751,7 @@ fill_d3d_texture_pixels(bool supports_automatic_mipmap_generation, IDirect3DDev
else {
// mipmaps need to be generated, either use autogen or d3dx functions
if (_managed == false && supports_automatic_mipmap_generation) {
if (_managed == false && scrn._supports_automatic_mipmap_generation) {
if (false)
{
//hr = _d3d_texture -> SetAutoGenFilterType (D3DTEXF_PYRAMIDALQUAD);
@ -1778,11 +1797,30 @@ fill_d3d_texture_pixels(bool supports_automatic_mipmap_generation, IDirect3DDev
// Description:
////////////////////////////////////////////////////////////////////
HRESULT DXTextureContext9::
fill_d3d_volume_texture_pixels() {
fill_d3d_volume_texture_pixels(DXScreenData &scrn) {
Texture *tex = get_texture();
HRESULT hr = E_FAIL;
nassertr(IS_VALID_PTR(get_texture()), E_FAIL);
nassertr(IS_VALID_PTR(tex), E_FAIL);
CPTA_uchar image;
if (scrn._dxgsg9->get_supports_compressed_texture()) {
image = tex->get_ram_image();
} else {
image = tex->get_uncompressed_ram_image();
}
Texture::CompressionMode image_compression;
if (image.is_null()) {
image_compression = Texture::CM_off;
} else {
image_compression = tex->get_ram_image_compression();
}
if (!scrn._dxgsg9->get_supports_compressed_texture_format(image_compression)) {
image = tex->get_uncompressed_ram_image();
image_compression = Texture::CM_off;
}
CPTA_uchar image = get_texture()->get_ram_image();
if (image.is_null()) {
// The texture doesn't have an image to load. That's ok; it
// might be a texture we've rendered to by frame buffer
@ -1793,15 +1831,15 @@ fill_d3d_volume_texture_pixels() {
PStatTimer timer(GraphicsStateGuardian::_load_texture_pcollector);
nassertr(IS_VALID_PTR(_d3d_texture), E_FAIL);
nassertr(get_texture()->get_texture_type() == Texture::TT_3d_texture, E_FAIL);
nassertr(tex->get_texture_type() == Texture::TT_3d_texture, E_FAIL);
DWORD orig_width = (DWORD) get_texture()->get_x_size();
DWORD orig_height = (DWORD) get_texture()->get_y_size();
DWORD orig_depth = (DWORD) get_texture()->get_z_size();
DWORD num_color_channels = get_texture()->get_num_components();
DWORD orig_width = (DWORD) tex->get_x_size();
DWORD orig_height = (DWORD) tex->get_y_size();
DWORD orig_depth = (DWORD) tex->get_z_size();
DWORD num_color_channels = tex->get_num_components();
D3DFORMAT source_format = _d3d_format;
BYTE *image_pixels = (BYTE*)image.p();
int component_width = get_texture()->get_component_width();
int component_width = tex->get_component_width();
nassertr(IS_VALID_PTR(image_pixels), E_FAIL);
@ -1814,7 +1852,7 @@ fill_d3d_volume_texture_pixels() {
if (FAILED(hr)) {
dxgsg9_cat.error()
<< "FillDDSurfaceTexturePixels failed for " << get_texture()->get_name()
<< "FillDDSurfaceTexturePixels failed for " << tex->get_name()
<< ", GetSurfaceLevel failed" << D3DERRORSTRING(hr);
return E_FAIL;
}
@ -1873,7 +1911,7 @@ fill_d3d_volume_texture_pixels() {
// original image, but dx8 doesn't support high-precision images
// anyway.
int num_components = get_texture()->get_num_components();
int num_components = tex->get_num_components();
int num_pixels = orig_width * orig_height * orig_depth * num_components;
BYTE *temp_buffer = new BYTE[num_pixels];
if (!IS_VALID_PTR(temp_buffer)) {
@ -1902,7 +1940,7 @@ fill_d3d_volume_texture_pixels() {
&source_size, level_0_filter, (D3DCOLOR)0x0);
if (FAILED(hr)) {
dxgsg9_cat.error()
<< "FillDDSurfaceTexturePixels failed for " << get_texture()->get_name()
<< "FillDDSurfaceTexturePixels failed for " << tex->get_name()
<< ", D3DXLoadVolumeFromMem failed" << D3DERRORSTRING(hr);
goto exit_FillDDSurf;
}
@ -1920,7 +1958,7 @@ fill_d3d_volume_texture_pixels() {
mip_filter_flags);
if (FAILED(hr)) {
dxgsg9_cat.error()
<< "FillDDSurfaceTexturePixels failed for " << get_texture()->get_name()
<< "FillDDSurfaceTexturePixels failed for " << tex->get_name()
<< ", D3DXFilterTex failed" << D3DERRORSTRING(hr);
goto exit_FillDDSurf;
}

4
panda/src/dxgsg9/dxTextureContext9.h
View File

@ -48,8 +48,8 @@ public:
private:
HRESULT fill_d3d_texture_mipmap_pixels(int mip_level, int depth_index, D3DFORMAT source_format);
HRESULT fill_d3d_texture_pixels(bool supports_automatic_mipmap_generation, IDirect3DDevice9 *device);
HRESULT fill_d3d_volume_texture_pixels();
HRESULT fill_d3d_texture_pixels(DXScreenData &scrn);
HRESULT fill_d3d_volume_texture_pixels(DXScreenData &scrn);
static int down_to_power_2(int value);
unsigned int get_bits_per_pixel(Texture::Format format, int *alphbits);

3
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -6780,7 +6780,8 @@ upload_texture(CLP(TextureContext) *gtc) {
// If we don't have the texture data right now, go get it, but in
// the meantime load a temporary simple image in its place.
async_reload_texture(gtc);
if (!tex->has_ram_image()) {
has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image();
if (!has_image) {
if (gtc->was_simple_image_modified()) {
return upload_simple_texture(gtc);
}