ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip changes (same crashes as d3d9ex)

This commit is contained in:
Squall-Leonhart 2023-07-02 13:44:51 +10:00
parent b9f0a71675
commit af29f51a43
2 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wx/drawing.h
View File

@ -58,7 +58,7 @@ struct Vertex
float u, v;
};
class DXDrawingPanel : public DrawingPanel
class DXDrawingPanel : public DrawingPanelBase
{
public:
DXDrawingPanel(wxWindow* parent, int _width, int _height);

62
src/wx/panel.cpp
View File

@ -2444,7 +2444,7 @@ void GLDrawingPanel::DrawArea(wxWindowDC& dc)
//#include <d3dx9core.h> // required for font rendering
DXDrawingPanel::DXDrawingPanel(wxWindow* parent, int _width, int _height)
: DrawingPanel(parent, _width, _height)
: DrawingPanelBase(_width, _height)
{
// Create the Direct3D9 object
IDirect3D9* d3d = Direct3DCreate9(D3D_SDK_VERSION);
@ -2481,6 +2481,8 @@ DXDrawingPanel::DXDrawingPanel(wxWindow* parent, int _width, int _height)
void DXDrawingPanel::DrawingPanelInit()
{
DrawingPanelBase::DrawingPanelInit();
// Set up the rendering state
bool bilinear = true; // Set the desired texture filtering mode here
@ -2530,6 +2532,7 @@ void DXDrawingPanel::DrawingPanelInit()
D3DPOOL_MANAGED,
&vbuffer,
NULL);
void* pVertices;
vbuffer->Lock(0,
sizeof(vertices),
@ -2580,12 +2583,51 @@ void DXDrawingPanel::DrawArea(wxWindowDC& dc)
int rowlen = std::ceil(width * scale) + (out_16 ? 2 : 1);
// Copy the image data from the todraw variable to the locked rectangle of the texture
uint8_t* src = todraw + (int)std::ceil(rowlen * (out_16 ? 2 : 4) * scale);
uint8_t* dst = (uint8_t*)rect.pBits;
for (int y = 0; y < std::ceil(height * scale); y++) {
memcpy(dst, src, rowlen * (out_16 ? 2 : 4));
src += rowlen * (out_16 ? 2 : 4);
dst += rect.Pitch;
if (systemColorDepth == 24) {
// never scaled, no borders, no transformations needed
memcpy(rect.pBits, todraw, rowlen * height * 3);
}
else if (out_16) {
// scaled by filters, top/right borders, transform to 32-bit
uint16_t* src = (uint16_t*)todraw + (int)std::ceil((width + 2) * scale); // skip top border
uint32_t* dst = (uint32_t*)rect.pBits;
for (int y = 0; y < std::ceil(height * scale); y++) {
for (int x = 0; x < std::ceil(width * scale); x++, src++) {
uint8_t r = ((*src >> systemRedShift) & 0x1f) << 3;
uint8_t g = ((*src >> systemGreenShift) & 0x1f) << 3;
uint8_t b = ((*src >> systemBlueShift) & 0x1f) << 3;
*dst++ = (r << 16) | (g << 8) | b;
}
src += 2; // skip rhs border
}
}
else if (OPTION(kDispFilter) != config::Filter::kNone) {
// scaled by filters, top/right borders, transform to 32-bit
uint32_t* src = (uint32_t*)todraw + (int)std::ceil(width * scale) + 1; // skip top border
uint32_t* dst = (uint32_t*)rect.pBits;
for (int y = 0; y < std::ceil(height * scale); y++) {
for (int x = 0; x < std::ceil(width * scale); x++, src++) {
uint8_t r = *src >> (systemRedShift - 3);
uint8_t g = *src >> (systemGreenShift - 3);
uint8_t b = *src >> (systemBlueShift - 3);
*dst++ = (r << 16) | (g << 8) | b;
}
++src; // skip rhs border
}
}
else { // 32 bit
// not scaled by filters, top/right borders, transform to 32-bit
uint32_t* src = (uint32_t*)todraw + (int)std::ceil((width + 1) * scale); // skip top border
uint32_t* dst = (uint32_t*)rect.pBits;
for (int y = 0; y < std::ceil(height * scale); y++) {
for (int x = 0; x < std::ceil(width * scale); x++, src++) {
uint8_t r = *src >> (systemRedShift - 3);
uint8_t g = *src >> (systemGreenShift - 3);
uint8_t b = *src >> (systemBlueShift - 3);
*dst++ = (r << 16) | (g << 8) | b;
}
++src; // skip rhs border
}
}
texture->UnlockRect(0);
@ -2626,9 +2668,11 @@ void DXDrawingPanel::OnSize(wxSizeEvent& ev)
// Update the projection matrix
float width = (float)ev.GetSize().GetWidth();
float height = (float)ev.GetSize().GetHeight();
float sx = width / (this->width * scale);
float sy = height / (this->height * scale);
D3DMATRIX matProj = {
2.0f / width, 0.0f, 0.0f, 0.0f,
0.0f, -2.0f / height, 0.0f, 0.0f,
2.0f / width * sx, 0.0f, 0.0f, 0.0f,
0.0f, -2.0f / height * sy, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
-1.0f, 1.0f, 0.0f, 1.0f
};