Ticket #14072: 20230130-ags-hob-barrow-debug-1.patch

engines/ags/engine/ac/draw.cpp

@@ -423 +423 @@
 }
 
 void dispose_room_drawdata() {
+        debug(1, "%s", __FUNCTION__);
         _GP(CameraDrawData).clear();
         dispose_invalid_regions(true);
 }
@@ -470 +471 @@
 
 // Allocates a bitmap for rendering camera/viewport pair (software render mode)
 void prepare_roomview_frame(Viewport *view) {
+        debug(1, "%s(view_index: %d)", __FUNCTION__, view->GetID());
         if (!view->GetCamera()) return; // no camera link
         const int view_index = view->GetID();
         const Size view_sz = view->GetRect().GetSize();
@@ -482 +484 @@
         //   regions outside of master bitmap, and we must not clamp surface size to virtual screen because
         //   plugins may want to also use viewport bitmap, therefore it should retain full size.
         if (cam_sz == view_sz && !draw_dat.IsOffscreen) {
+                debug(1, "#1");
                 // note we keep the buffer allocated in case it will become useful later
                 draw_dat.Frame.reset();
         } else {
+                debug(1, "#2");
+                debug(1, " _GP(CameraDrawData)[view_index].Frame.get(): %p", (void *)(_GP(CameraDrawData)[view_index].Frame.get()));
                 PBitmap &camera_frame = draw_dat.Frame;
                 PBitmap &camera_buffer = draw_dat.Buffer;
                 if (!camera_buffer || camera_buffer->GetWidth() < cam_sz.Width || camera_buffer->GetHeight() < cam_sz.Height) {
+                        debug(1, "#3");
                         // Allocate new buffer bitmap with an extra size in case they will want to zoom out
                         int room_width = data_to_game_coord(_GP(thisroom).Width);
                         int room_height = data_to_game_coord(_GP(thisroom).Height);
+                        debug(1, "room_width: %d room_height: %d", room_width, room_height);
                         Size alloc_sz = Size::Clamp(cam_sz * 2, Size(1, 1), Size(room_width, room_height));
+                        debug(1, "alloc_sz.Width: %d alloc_sz.Height: %d", alloc_sz.Width, alloc_sz.Height);
                         camera_buffer.reset(new Bitmap(alloc_sz.Width, alloc_sz.Height, _G(gfxDriver)->GetMemoryBackBuffer()->GetColorDepth()));
                 }
 
                 if (!camera_frame || camera_frame->GetSize() != cam_sz) {
+                        debug(1, "#4");
                         camera_frame.reset(BitmapHelper::CreateSubBitmap(camera_buffer.get(), RectWH(cam_sz)));
                 }
+                assert(draw_dat.Frame->GetAllegroBitmap()->_owner != nullptr);
+                assert(draw_dat.Buffer->GetAllegroBitmap()->_owner != nullptr);
+                debug(1, " _GP(CameraDrawData)[view_index].Frame.get(): %p", (void *)(_GP(CameraDrawData)[view_index].Frame.get()));
         }
+
+        /*{
+                RoomCameraDrawData &d = _GP(CameraDrawData)[view_index];
+                assert(d.Frame->GetAllegroBitmap()->_owner != nullptr);
+                assert(d.Buffer->GetAllegroBitmap()->_owner != nullptr);
+        }*/
 }
 
 // Syncs room viewport and camera in case either size has changed
@@ -513 +531 @@
 }
 
 void init_room_drawdata() {
+        debug(1, "%s", __FUNCTION__);
         // Update debug overlays, if any were on
         debug_draw_room_mask(_G(debugRoomMask));
         debug_draw_movelist(_G(debugMoveListChar));
@@ -522 +541 @@
                 return;
         // Make sure all frame buffers are created for software drawing
         int view_count = _GP(play).GetRoomViewportCount();
+        debug(1, "view_count: %d", view_count);
         _GP(CameraDrawData).resize(view_count);
         for (int i = 0; i < _GP(play).GetRoomViewportCount(); ++i)
                 sync_roomview(_GP(play).GetRoomViewport(i).get());
 }
 
 void on_roomviewport_created(int index) {
+        debug(1, "%s(%d)", __FUNCTION__, index);
         if (!_G(gfxDriver) || _G(gfxDriver)->RequiresFullRedrawEachFrame())
                 return;
         if ((size_t)index < _GP(CameraDrawData).size())
@@ -536 +557 @@
 }
 
 void on_roomviewport_deleted(int index) {
+        debug(1, "%s(%d)", __FUNCTION__, index);
         if (_G(gfxDriver)->RequiresFullRedrawEachFrame())
                 return;
         _GP(CameraDrawData).erase(_GP(CameraDrawData).begin() + index);
@@ -543 +565 @@
 }
 
 void on_roomviewport_changed(Viewport *view) {
+        debug(1, "%s", __FUNCTION__);
         if (_G(gfxDriver)->RequiresFullRedrawEachFrame())
                 return;
         if (!view->IsVisible() || view->GetCamera() == nullptr)
@@ -1789 +1812 @@
         // If separate bitmap was prepared for this view/camera pair then use it, draw untransformed
         // and blit transformed whole surface later.
         const bool draw_to_camsurf = _GP(CameraDrawData)[view_index].Frame != nullptr;
+        debug(1, "draw_to_camsurf: %d view_index:%d _GP(CameraDrawData)[view_index].Frame.get():%p", draw_to_camsurf, view_index, (void *)(_GP(CameraDrawData)[view_index].Frame.get()));
         Bitmap *roomcam_surface = draw_to_camsurf ? _GP(CameraDrawData)[view_index].Frame.get() : ds;
+        assert(roomcam_surface->GetAllegroBitmap()->_owner != nullptr);
         {
                 // For software renderer: copy dirty rects onto the virtual screen.
                 // TODO: that would be SUPER NICE to reorganize the code and move this operation into SoftwareGraphicDriver somehow.

engines/ags/lib/allegro/surface.cpp

@@ -111 +111 @@
                   int dstX, int dstY, bool horizFlip, bool vertFlip,
                   bool skipTrans, int srcAlpha, int tintRed, int tintGreen,
                   int tintBlue) {
+        assert(_owner != nullptr);
         assert(format.bytesPerPixel == 2 || format.bytesPerPixel == 4 ||
                (format.bytesPerPixel == 1 && srcBitmap->format.bytesPerPixel == 1));
 

engines/ags/lib/allegro/surface.h

@@ -29 +29 @@
 namespace AGS3 {
 
 class BITMAP {
-private:
+public:
         Graphics::ManagedSurface *_owner;
-        public:
         int16 &w, &h, &pitch;
         Graphics::PixelFormat &format;
         bool clip;