| Index: ddraw/glRenderer.cpp |
| — | — | @@ -3597,6 +3597,7 @@ |
| 3598 | 3598 | if (!paletted && firstpass && (dxglcfg.postfilter == 1))
|
| 3599 | 3599 | glTexture__SetFilter(*texture, 8, GL_LINEAR, GL_LINEAR, This);
|
| 3600 | 3600 | else glTexture__SetFilter(*texture, 8, GL_NEAREST, GL_NEAREST, This);
|
| | 3601 | + This->ext->glUniform1i(This->shaders->shaders[progtype].tex0, 8);
|
| 3601 | 3602 | This->ext->glUniform4f(This->shaders->shaders[progtype].view,view[0],view[1],view[2],view[3]);
|
| 3602 | 3603 | This->bltvertices[0].s = This->bltvertices[0].t = This->bltvertices[1].t = This->bltvertices[2].s = 1.;
|
| 3603 | 3604 | This->bltvertices[1].s = This->bltvertices[2].t = This->bltvertices[3].s = This->bltvertices[3].t = 0.;
|
| — | — | @@ -3653,6 +3654,7 @@ |
| 3654 | 3655 | glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
| 3655 | 3656 | glUtil_SetScissor(This->util, FALSE, 0, 0, 0, 0);
|
| 3656 | 3657 | glUtil_SetTexture(This->util, 8, texture);
|
| | 3658 | + This->ext->glUniform1i(This->shaders->shaders[progtype].tex0, 8);
|
| 3657 | 3659 | This->ext->glUniform4f(This->shaders->shaders[progtype].view, view[0], view[1], view[2], view[3]);
|
| 3658 | 3660 | This->bltvertices[1].s = This->bltvertices[3].s = (GLfloat)srcrect.left / (GLfloat)texture->levels[0].ddsd.dwWidth;
|
| 3659 | 3661 | This->bltvertices[0].s = This->bltvertices[2].s = (GLfloat)srcrect.right / (GLfloat)texture->levels[0].ddsd.dwWidth;
|
| Index: dxglcfg/dxglcfg.cpp |
| — | — | @@ -3140,6 +3140,7 @@ |
| 3141 | 3141 | SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 3142 | 3142 | _tcscpy(buffer, _T("Bilinear"));
|
| 3143 | 3143 | SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_ADDSTRING, 1, (LPARAM)buffer);
|
| | 3144 | + /* Temporarily removed until implemented
|
| 3144 | 3145 | _tcscpy(buffer, _T("Bilinear, nearest colorkey"));
|
| 3145 | 3146 | SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_ADDSTRING, 2, (LPARAM)buffer);
|
| 3146 | 3147 | _tcscpy(buffer, _T("Bilinear, sharp colorkey"));
|
| — | — | @@ -3146,6 +3147,7 @@ |
| 3147 | 3148 | SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_ADDSTRING, 3, (LPARAM)buffer);
|
| 3148 | 3149 | _tcscpy(buffer, _T("Bilinear, soft colorkey"));
|
| 3149 | 3150 | SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_ADDSTRING, 4, (LPARAM)buffer);
|
| | 3151 | + */
|
| 3150 | 3152 | SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_SETCURSEL, cfg->BltScale, 0);
|
| 3151 | 3153 | // Removed for DXGL 0.5.13 release
|
| 3152 | 3154 | // Blt scaling threshold
|